Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix IOException when using sbt thin client (backport #10890) #11014

Merged
merged 2 commits into from
Nov 13, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 12, 2021

This is an automatic backport of pull request #10890 done by Mergify.
Cherry-pick of 932aede has failed:

On branch mergify/bp/2.8.x/pr-10890
Your branch is up to date with 'origin/2.8.x'.

You are currently cherry-picking commit 932aede1d2.
  (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:   dev-mode/sbt-plugin/src/main/scala/play/sbt/PlayInteractionMode.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/github/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.

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 <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit 932aede)

# Conflicts:
#	dev-mode/sbt-plugin/src/main/scala/play/sbt/PlayInteractionMode.scala
@mergify mergify bot added the conflicts label Nov 12, 2021
@mkurz mkurz added this to the 2.8.9 milestone Nov 12, 2021
@mergify mergify bot merged commit 5254801 into 2.8.x Nov 13, 2021
@mergify mergify bot deleted the mergify/bp/2.8.x/pr-10890 branch November 13, 2021 12:42
@octonato octonato modified the milestones: 2.8.9, 2.8.11 Dec 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants