Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Jun 20, 2025

They just happen with a combination of OTP 27.3 and Elixir 1.17


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

They just happen with a combination of OTP 27.3 and Elixir 1.17

(cherry picked from commit 0801e68)

# Conflicts:
#	deps/rabbitmq_federation/Makefile
@mergify
Copy link
Author

mergify bot commented Jun 20, 2025

Cherry-pick of 0801e68 has failed:

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

You are currently cherry-picking commit 0801e68c1.
  (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:   deps/rabbitmq_federation/Makefile

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 Jun 20, 2025
@michaelklishin michaelklishin added this to the 4.1.2 milestone Jun 20, 2025
@michaelklishin michaelklishin merged commit 73d49cb into v4.1.x Jun 23, 2025
541 of 543 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v4.1.x/pr-14097 branch June 23, 2025 09:04
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