Closed mergify[bot] closed 2 months ago
Cherry-pick of f8426018df75f62466ae2ecd5768415378551d0b has failed:
On branch mergify/bp/main/pr-669
Your branch is up to date with 'origin/main'.
You are currently cherry-picking commit f8426018.
(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: play-java-websocket-example/app/assets/stylesheets/main.less
modified: play-java-websocket-example/app/controllers/HomeController.java
modified: play-java-websocket-example/app/views/index.scala.html
modified: play-java-websocket-example/conf/application.conf
modified: play-java-websocket-example/conf/logback.xml
modified: play-java-websocket-example/conf/routes
modified: play-java-websocket-example/test/controllers/WebSocketClient.java
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: play-java-websocket-example/build.sbt
Cherry-pick of f707d8933382c8df6967129ee5261709826693c6 has failed:
On branch mergify/bp/main/pr-669
Your branch is ahead of 'origin/main' by 1 commit.
(use "git push" to publish your local commits)
You are currently cherry-picking commit f707d893.
(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: play-java-websocket-example/app/controllers/HomeController.java
modified: play-java-websocket-example/app/views/index.scala.html
modified: play-java-websocket-example/conf/routes
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: play-java-websocket-example/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
@ihostage feel free to resolve conflicts, I have an appointment in the afternoon.
@ihostage feel free to resolve conflicts, I have an appointment in the afternoon.
Got it 👌
The code in
play-scala-websocket-example
andplay-java-websocket-example
is now synced and pretty much the same, except the java vs scala source code of course.This is an automatic backport of pull request #669 done by Mergify.