Closed mergify[bot] closed 1 week ago
Cherry-pick of a8ec4dce80b85a241f39f920edd037d23c6db689 has failed:
On branch mergify/bp/2.7.x/pr-621
Your branch is up to date with 'origin/2.7.x'.
You are currently cherry-picking commit a8ec4dc.
(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/Common.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
This is an automatic backport of pull request #621 done by Mergify.