Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Nov 26, 2024

Release notes:
https://github.com/rabbitmq/khepri_mnesia_migration/releases/tag/v0.7.1


This is an automatic backport of pull request #12748 done by Mergify.

@mergify mergify bot added the conflicts label Nov 26, 2024
@mergify
Copy link
Author

mergify bot commented Nov 26, 2024

Cherry-pick of 7e59f38 has failed:

On branch mergify/bp/v4.0.x/pr-12748
Your branch is up to date with 'origin/v4.0.x'.

You are currently cherry-picking commit 7e59f38ad4.
  (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:   MODULE.bazel

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rabbitmq-components.mk

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@dumbbell dumbbell marked this pull request as draft November 26, 2024 17:20
@dumbbell dumbbell force-pushed the mergify/bp/v4.0.x/pr-12748 branch from 277c098 to 23b5b73 Compare November 26, 2024 17:21
@dumbbell dumbbell marked this pull request as ready for review November 27, 2024 09:45
@dumbbell dumbbell merged commit b1db591 into v4.0.x Nov 27, 2024
231 checks passed
@dumbbell dumbbell deleted the mergify/bp/v4.0.x/pr-12748 branch November 27, 2024 09:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants