mergify[bot]
commented
2 weeks ago Cherry-pick of f28ec6c5ed5250bfcf16255771cf1ac3e39b0187 has failed:
On branch mergify/bp/v3.11.x/pr-11500
Your branch is up to date with 'origin/v3.11.x'.
You are currently cherry-picking commit f28ec6c5ed.
(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: .github/workflows/templates/test-mixed-versions.template.yaml
modified: .github/workflows/test-authnz.yaml
modified: .github/workflows/test-mixed-versions.yaml
modified: .github/workflows/test-selenium.yaml
modified: user-template.bazelrc
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
deleted by them: .github/workflows/test-erlang-git.yaml
both modified: .github/workflows/test-windows.yaml
both modified: bazel/bzlmod/secondary_umbrella.bzl
Cherry-pick of 91665228ccdf779d3a0165d2448ff6a3c8074a8f has failed:
On branch mergify/bp/v3.11.x/pr-11500
Your branch is ahead of 'origin/v3.11.x' by 1 commit.
(use "git push" to publish your local commits)
You are currently cherry-picking commit 91665228cc.
(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: bazel/bzlmod/secondary_umbrella.bzl
no changes added to commit (use "git add" and/or "git commit -a")Cherry-pick of 91b4d0f5b17b20faed32e1ae42c6a28575e1ad2c has failed:
On branch mergify/bp/v3.11.x/pr-11500
Your branch is ahead of 'origin/v3.11.x' by 2 commits.
(use "git push" to publish your local commits)
You are currently cherry-picking commit 91b4d0f5b1.
(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/rm <file>..." as appropriate to mark resolution)
deleted by them: .github/workflows/perform-bazel-execution-comparison.yaml
both modified: bazel/bzlmod/secondary_umbrella.bzl
no changes added to commit (use "git add" and/or "git commit -a")Cherry-pick of 76e0da11d767a0676efc6e4352d9079e77702032 has failed:
On branch mergify/bp/v3.11.x/pr-11500
Your branch is ahead of 'origin/v3.11.x' by 3 commits.
(use "git push" to publish your local commits)
You are currently cherry-picking commit 76e0da11d7.
(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: bazel/bzlmod/secondary_umbrella.bzl
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
Some nightly or less-often run suites had not been updated
This is an automatic backport of pull request #11478 done by Mergify.
This is an automatic backport of pull request #11488 done by Mergify.
This is an automatic backport of pull request #11500 done by Mergify.