Merge pull request #1642 from scala-steward-org/topic/use-std-commit-message

fthomas · web-flow · commit d4d0855620f6 · 2020-10-06T17:47:51.000+02:00
Use Git's default commit message when resolving merge conflicts
diff --git a/modules/core/src/main/scala/org/scalasteward/core/git/GitAlg.scala b/modules/core/src/main/scala/org/scalasteward/core/git/GitAlg.scala
@@ -173,7 +173,7 @@ object GitAlg {
                   case Some(files) => files.traverse(file => exec(Nel.of("rm", file), repoDir))
                   case None        => F.raiseError(throwable)
                 }
-                _ <- commitAll(repo, "Remove unmerged files")
+                _ <- exec(Nel.of("commit", "--all", "--no-edit") ++ sign, repoDir)
               } yield List.empty
             }
           after <- latestSha1(repo, Branch.head)

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ object GitAlg {`
`173`	`173`	`case Some(files) => files.traverse(file => exec(Nel.of("rm", file), repoDir))`
`174`	`174`	`case None => F.raiseError(throwable)`
`175`	`175`	`}`
`176`		`- _ <- commitAll(repo, "Remove unmerged files")`
	`176`	`+ _ <- exec(Nel.of("commit", "--all", "--no-edit") ++ sign, repoDir)`
`177`	`177`	`} yield List.empty`
`178`	`178`	`}`
`179`	`179`	`after <- latestSha1(repo, Branch.head)`