Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Jan 26, 2023

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

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

You are currently cherry-picking commit d3f157f2b9.
  (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:   MODULE.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/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

(cherry picked from commit 292ef00)
(cherry picked from commit d3f157f)

# Conflicts:
#	MODULE.bazel
@michaelklishin michaelklishin merged commit 66ab363 into v3.10.x Jan 26, 2023
@michaelklishin michaelklishin deleted the mergify/bp/v3.10.x/pr-7051 branch January 26, 2023 12:05
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