Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: localosmosis build patch (backport #2728) #2734

Merged
merged 2 commits into from
Sep 14, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 14, 2022

This is an automatic backport of pull request #2728 done by Mergify.
Cherry-pick of 69d648c has failed:

On branch mergify/bp/v12.x/pr-2728
Your branch is up to date with 'origin/v12.x'.

You are currently cherry-picking commit 69d648c7.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   tests/localosmosis/scripts/add_keys.sh
	modified:   tests/localosmosis/scripts/setup.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Makefile

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit 69d648c)

# Conflicts:
#	Makefile
@mergify mergify bot requested a review from a team September 14, 2022 09:38
@mergify mergify bot added the conflicts label Sep 14, 2022
@czarcas7ic czarcas7ic merged commit 3768e35 into v12.x Sep 14, 2022
@czarcas7ic czarcas7ic deleted the mergify/bp/v12.x/pr-2728 branch September 14, 2022 16:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

1 participant