Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Oct 8, 2024

The PR is by @SimonUnge.


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

(cherry picked from commit 770dfd6)

Conflicts:
	rabbitmq-components.mk
(cherry picked from commit c348501)

# Conflicts:
#	rabbitmq-components.mk
@mergify mergify bot added the conflicts label Oct 8, 2024
@mergify
Copy link
Author

mergify bot commented Oct 8, 2024

Cherry-pick of c348501 has failed:

On branch mergify/bp/v3.13.x/pr-12484
Your branch is up to date with 'origin/v3.13.x'.

You are currently cherry-picking commit c348501db2.
  (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
	modified:   bazel/BUILD.redbug

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

@michaelklishin michaelklishin changed the title 4.0.x: upgrade Redbug to 2.1.0 (backport #12484) 3.13.x: upgrade Redbug to 2.1.0 (backport #12484) Oct 8, 2024
@michaelklishin michaelklishin merged commit 94ccc8a into v3.13.x Oct 8, 2024
261 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v3.13.x/pr-12484 branch October 8, 2024 23:25
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.

3 participants