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

Fixup rabbitmq_amqp1_0 BUILD.bazel (backport #10757) #10758

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Mar 16, 2024

Otherwise bazel build //deps/rabbitmq_amqp1_0:all fails


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

(cherry picked from commit 7710ff3)

# Conflicts:
#	deps/rabbitmq_amqp1_0/BUILD.bazel
@mergify mergify bot added the conflicts label Mar 16, 2024
@mergify mergify bot assigned pjk25 Mar 16, 2024
Copy link
Author

mergify bot commented Mar 16, 2024

Cherry-pick of 7710ff3 has failed:

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

You are currently cherry-picking commit 7710ff3b4a.
  (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_amqp1_0/BUILD.bazel

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 bazel label Mar 16, 2024
@michaelklishin michaelklishin deleted the mergify/bp/v3.13.x/pr-10757 branch March 16, 2024 16:40
@michaelklishin
Copy link
Member

Sorry, this only applies to main, my bad.

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.

None yet

2 participants