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

Update sbt-scalafmt to 2.4.2 #198

Merged

Conversation

scala-steward
Copy link
Contributor

Updates org.scalameta:sbt-scalafmt from 2.4.0 to 2.4.2.
GitHub Release Notes - Version Diff

I'll automatically update this PR to resolve conflicts as long as you don't change it yourself.

If you'd like to skip this version, you can just close this PR. If you have any feedback, just mention me in the comments below.

Configure Scala Steward for your repository with a .scala-steward.conf file.

Have a fantastic day writing Scala!

Ignore future updates

Add this to your .scala-steward.conf file to ignore future updates of this dependency:

updates.ignore = [ { groupId = "org.scalameta", artifactId = "sbt-scalafmt" } ]

labels: sbt-plugin-update, semver-patch

@mergify mergify bot added the dependencies label Aug 1, 2020
@ihostage
Copy link
Member

ihostage commented Sep 1, 2020

@Mergifyio rebase

@mergify
Copy link
Contributor

mergify bot commented Sep 1, 2020

Command rebase: failure

Branch rebase failed
First, rewinding head to replay your work on top of it...
Applying: Update sbt-scalafmt to 2.4.2
Using index info to reconstruct a base tree...
M project/plugins.sbt
Falling back to patching base and 3-way merge...
Auto-merging project/plugins.sbt
CONFLICT (content): Merge conflict in project/plugins.sbt
error: Failed to merge in the changes.
Patch failed at 0001 Update sbt-scalafmt to 2.4.2
Use 'git am --show-current-patch' to see the failed patch

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

err-code: D76E4

@mergify mergify bot merged commit 8f2802d into playframework:master Sep 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants