mergify[bot]
commented
8 months ago Cherry-pick of 19086489f6ec20ad24a50a0635c6d79cd08e1d96 has failed:
On branch mergify/bp/1.6.x/pr-747
Your branch is ahead of 'origin/1.6.x' by 1 commit.
(use "git push" to publish your local commits)
You are currently cherry-picking commit 1908648.
(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: build.sbt
no changes added to commit (use "git add" and/or "git commit -a")Cherry-pick of e9e3dd46026e0a7bca3b9b242cd53e2ceb7d96c8 has failed:
On branch mergify/bp/1.6.x/pr-747
Your branch is ahead of 'origin/1.6.x' by 2 commits.
(use "git push" to publish your local commits)
You are currently cherry-picking commit e9e3dd4.
(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:
new file: api/shared/src/main/scala/play/twirl/api/Template.scala
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: build.sbt
Cherry-pick of 75eec7cf46e23f0d10fa0a7f24d2f9b44c6c9738 has failed:
On branch mergify/bp/1.6.x/pr-747
Your branch is ahead of 'origin/1.6.x' by 3 commits.
(use "git push" to publish your local commits)
You are currently cherry-picking commit 75eec7c.
(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: compiler/src/main/scala/play/twirl/compiler/TwirlCompiler.scala
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: build.sbt
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
This is an automatic backport of pull request #747 done by Mergify. Cherry-pick of 19086489f6ec20ad24a50a0635c6d79cd08e1d96 has failed:
Cherry-pick of e9e3dd46026e0a7bca3b9b242cd53e2ceb7d96c8 has failed:
Cherry-pick of 75eec7cf46e23f0d10fa0a7f24d2f9b44c6c9738 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