Skip to content

Commit fde025a

Browse files
committed
ci: pin automergeStrategy to squash
The default, auto, follows the repository's platform merge strategy. Every ruleset in the fleet now requires linear history while still allowing merge commits, so an auto choice of merge-commit would be rejected and the PR would sit unmerged with all checks green. squash is permitted by every ruleset and satisfies linear history.
1 parent 56d79c6 commit fde025a

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

renovate.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,5 +114,6 @@
114114
"automerge": false
115115
}
116116
],
117-
"prConcurrentLimit": 5
117+
"prConcurrentLimit": 5,
118+
"automergeStrategy": "squash"
118119
}

0 commit comments

Comments
 (0)