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

chore(x/gov): update proposal.json go doc (backport #17397) #17403

Merged
merged 2 commits into from
Aug 16, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 16, 2023

This is an automatic backport of pull request #17397 done by Mergify.
Cherry-pick of 2d32576 has failed:

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

You are currently cherry-picking commit 2d32576c8.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x/gov/client/cli/tx.go

no changes added to commit (use "git add" and/or "git commit -a")

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 2d32576)

# Conflicts:
#	x/gov/client/cli/tx.go
@mergify mergify bot requested a review from a team as a code owner August 16, 2023 07:23
@mergify mergify bot added the conflicts label Aug 16, 2023
@julienrbrt julienrbrt enabled auto-merge (squash) August 16, 2023 08:40
@julienrbrt julienrbrt merged commit 0a28ba9 into release/v0.47.x Aug 16, 2023
23 of 24 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.47.x/pr-17397 branch August 16, 2023 08:59
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