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(x/group): rename group's legacy ORM error codespace to prevent co… (backport #17146) #17148

Merged
merged 2 commits into from
Jul 26, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 26, 2023

This is an automatic backport of pull request #17146 done by Mergify.
Cherry-pick of 026073b has failed:

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

You are currently cherry-picking commit 026073ba1.
  (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/errors/orm.go

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

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

#17146)

(cherry picked from commit 026073b)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner July 26, 2023 18:39
@mergify mergify bot added the conflicts label Jul 26, 2023
@github-prbot github-prbot requested review from a team, alexanderbez and testinginprod and removed request for a team July 26, 2023 18:39
@julienrbrt julienrbrt merged commit 9492cf3 into release/v0.50.x Jul 26, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-17146 branch July 26, 2023 18:58
@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