Skip to content

Commit 3a0c9a3

Browse files
committed
Merge instead of squash Scala Steward PRs
1 parent ef0d0e3 commit 3a0c9a3

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.mergify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ pull_request_rules:
2525
- status-success=Build and Test (ubuntu-latest, 2.13, temurin@11)
2626
actions:
2727
merge:
28-
method: squash
28+
method: merge

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ ThisBuild / mergifyPrRules := {
7878
MergifyPrRule(
7979
"merge scala-steward's PRs",
8080
List(authorCondition) ++ mergifySuccessConditions.value,
81-
List(MergifyAction.Merge(Some("squash")))
81+
List(MergifyAction.Merge(Some("merge")))
8282
)
8383
)
8484
}

0 commit comments

Comments
 (0)