From 3a0c9a337a95ee0c9fffb75b76c455f37508c93f Mon Sep 17 00:00:00 2001
From: "Frank S. Thomas" <frank@timepit.eu>
Date: Tue, 9 Jan 2024 17:01:05 +0100
Subject: [PATCH] Merge instead of squash Scala Steward PRs

---
 .mergify.yml | 2 +-
 build.sbt    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index b58f83cc8a..03906aab1b 100644
--- 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
index a0d6dd6ed1..4851860665 100644
--- 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")))
     )
   )
 }