Merge instead of squash Scala Steward PRs

scala-steward-org · Jan 9, 2024 · 3a0c9a3 · 3a0c9a3
1 parent ef0d0e3
commit 3a0c9a3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -25,4 +25,4 @@ pull_request_rules:
   - status-success=Build and Test (ubuntu-latest, 2.13, temurin@11)
   actions:
     merge:
-      method: squash
+      method: merge
diff --git a/build.sbt b/build.sbt
@@ -78,7 +78,7 @@ ThisBuild / mergifyPrRules := {
     MergifyPrRule(
       "merge scala-steward's PRs",
       List(authorCondition) ++ mergifySuccessConditions.value,
-      List(MergifyAction.Merge(Some("squash")))
+      List(MergifyAction.Merge(Some("merge")))
     )
   )
 }