8000 Use squash merge strategy for mergify (#7455) · amit/activeadmin@97e46d1 · GitHub
[go: up one dir, main page]

Skip to content

Commit 97e46d1

Browse files
Use squash merge strategy for mergify (activeadmin#7455)
This matches how we usually merge other PRs: Merge strategy in general, except for single commit PRs, where we use squash. Dependabot PRs are single commit, so we should use squash for them too.
1 parent fa3e511 commit 97e46d1

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

.github/mergify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ pull_request_rules:
88

99
actions:
1010
merge:
11-
method: merge
11+
method: squash

0 commit comments

Comments
 (0)
0