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

feat(x/crisis): add autocli options for tx (backport #17965) #17982

Merged
merged 3 commits into from
Oct 6, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 6, 2023

This is an automatic backport of pull request #17965 done by Mergify.
Cherry-pick of 12b45f3 has failed:

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

You are currently cherry-picking commit 12b45f3db.
  (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:   x/crisis/autocli.go
	deleted:    x/crisis/client/cli/tx.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: x/crisis/client/cli/tx_test.go
	both modified:   x/crisis/module.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 12b45f3)

# Conflicts:
#	x/crisis/client/cli/tx_test.go
#	x/crisis/module.go
@mergify mergify bot requested a review from a team as a code owner October 6, 2023 08:11
@mergify mergify bot added the conflicts label Oct 6, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Oct 6, 2023

@mergify[bot] your pull request is missing a changelog!

@tac0turtle tac0turtle self-assigned this Oct 6, 2023
@tac0turtle tac0turtle enabled auto-merge (squash) October 6, 2023 08:14
@tac0turtle tac0turtle merged commit a2f2c92 into release/v0.50.x Oct 6, 2023
44 of 46 checks passed
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.50.x/pr-17965 branch October 6, 2023 08:46
@faddat faddat mentioned this pull request Nov 8, 2024
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants