Skip to content

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 13, 2023

This is an automatic backport of pull request #9055 done by Mergify.
Cherry-pick of dbd319f has failed:

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

You are currently cherry-picking commit dbd319f5f8.
  (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.osiris

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   deps/rabbit/Makefile
	deleted by us:   release-notes/3.12.1.md

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

In #8616, Osiris was bumped to 1.6.0 but
`BUILD.bazel` in the repo still reported the version as 1.5.1.

That created a fair amount of confusion.

(cherry picked from commit dbd319f)

# Conflicts:
#	deps/rabbit/Makefile
#	release-notes/3.12.1.md
@michaelklishin michaelklishin added this to the 3.11.21 milestone Aug 13, 2023
@michaelklishin michaelklishin merged commit 9e5aef0 into v3.11.x Aug 13, 2023
@michaelklishin michaelklishin deleted the mergify/bp/v3.11.x/pr-9055 branch August 13, 2023 09:14
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.

1 participant