Closed mergify[bot] closed 4 months ago
Cherry-pick of 5aa0fb62d282dbb0073629e06995628d89e3de45 has failed:
On branch mergify/bp/7.x/pr-451
Your branch is up to date with 'origin/7.x'.
You are currently cherry-picking commit 5aa0fb6.
(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: project/Dependencies.scala
no changes added to commit (use "git add" and/or "git commit -a")
Cherry-pick of 5a7fbec036fb645f8c8953b65e630fadc87c6227 has failed:
On branch mergify/bp/7.x/pr-451
Your branch is ahead of 'origin/7.x' by 1 commit.
(use "git push" to publish your local commits)
You are currently cherry-picking commit 5a7fbec.
(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: project/Dependencies.scala
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
Replaced by
This is an automatic backport of pull request #451 done by Mergify. Cherry-pick of 5aa0fb62d282dbb0073629e06995628d89e3de45 has failed:
Cherry-pick of 5a7fbec036fb645f8c8953b65e630fadc87c6227 has failed:
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 commands and options
More conditions and actions can be found in the [documentation](https://docs.mergify.com/). 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