Skip to content

Commit 716170e

Browse files
committed
chore(gh): Ban rebase merges
1 parent 96297f0 commit 716170e

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

.github/settings.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@ repository:
1010
has_downloads: true
1111
default_branch: main
1212

13-
allow_squash_merge: true
13+
# Preference: people do clean commits
1414
allow_merge_commit: true
15-
allow_rebase_merge: true
15+
# Backup in case we need to clean up commits
16+
allow_squash_merge: true
17+
# Not really needed
18+
allow_rebase_merge: false
1619

1720
allow_auto_merge: true
1821
delete_branch_on_merge: true

0 commit comments

Comments
 (0)