Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Mar 25, 2025


This is an automatic backport of pull request #13607 done by [Mergify](https://mergify.com).
This is an automatic backport of pull request #13608 done by [Mergify](https://mergify.com).

(cherry picked from commit 265e273)
(cherry picked from commit 7ec3aa7)

# Conflicts:
#	rabbitmq-components.mk
@mergify mergify bot added the conflicts label Mar 25, 2025
@mergify
Copy link
Author

mergify bot commented Mar 25, 2025

Cherry-pick of 7ec3aa7 has failed:

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

You are currently cherry-picking commit 7ec3aa745.
  (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:   rabbitmq-components.mk

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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the make label Mar 25, 2025
@michaelklishin michaelklishin added this to the 4.0.8 milestone Mar 25, 2025
@michaelklishin michaelklishin merged commit a2fe7db into v4.0.x Mar 25, 2025
266 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v4.0.x/pr-13608 branch March 25, 2025 21:46
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