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(client/v2): resolve keyring flags properly (backport #19060) #19105

Merged
merged 4 commits into from
Jan 18, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 18, 2024

This is an automatic backport of pull request #19060 done by Mergify.
Cherry-pick of 8f39bfb has failed:

On branch mergify/bp/release/v0.50.x/pr-19060
Your branch is up to date with 'origin/release/v0.50.x'.

You are currently cherry-picking commit 8f39bfb4e.
  (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:   client/cmd.go
	modified:   client/v2/autocli/app.go
	modified:   client/v2/autocli/common.go
	modified:   client/v2/autocli/flag/address.go
	modified:   client/v2/autocli/msg_test.go
	modified:   client/v2/autocli/query.go
	modified:   client/v2/autocli/query_test.go
	modified:   client/v2/autocli/util.go
	modified:   scripts/init-simapp.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   client/v2/CHANGELOG.md
	both modified:   client/v2/autocli/builder.go
	both modified:   client/v2/autocli/common_test.go
	both modified:   client/v2/autocli/msg.go

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 8f39bfb)

# Conflicts:
#	client/v2/CHANGELOG.md
#	client/v2/autocli/builder.go
#	client/v2/autocli/common_test.go
#	client/v2/autocli/msg.go
@mergify mergify bot requested a review from a team as a code owner January 18, 2024 19:31
@mergify mergify bot added the conflicts label Jan 18, 2024
@julienrbrt julienrbrt self-assigned this Jan 18, 2024
@julienrbrt julienrbrt enabled auto-merge (squash) January 18, 2024 21:05
@julienrbrt julienrbrt merged commit 3897926 into release/v0.50.x Jan 18, 2024
40 of 46 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-19060 branch January 18, 2024 21:09
roy-dydx pushed a commit to dydxprotocol/cosmos-sdk that referenced this pull request Feb 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant