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: unique constraint violation for group policy sim genesis (backport #15943) #15951

Merged
merged 3 commits into from
Apr 26, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 26, 2023

This is an automatic backport of pull request #15943 done by Mergify.
Cherry-pick of e59c4a8 has failed:

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

You are currently cherry-picking commit e59c4a857.
  (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/group/simulation/genesis.go
	modified:   x/simulation/client/cli/flags.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   simapp/sim_test.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 e59c4a8)

# Conflicts:
#	simapp/sim_test.go
@julienrbrt julienrbrt merged commit 1f27e70 into release/v0.47.x Apr 26, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.47.x/pr-15943 branch April 26, 2023 16:40
roy-dydx pushed a commit to dydxprotocol/cosmos-sdk that referenced this pull request Jul 11, 2023
cosmos#15943) (cosmos#15951)

Co-authored-by: Gjermund Garaba <gjermund@garaba.net>
Co-authored-by: Julien Robert <julien@rbrt.fr>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.

2 participants