Modify repo settings to only allow rebase merging PRs

Signed-off-by: Pavlos Tzianos <[email protected]>
smithy-security · Feb 5, 2024 · c43f0d0 · c43f0d0
1 parent 4230d1b
commit c43f0d0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/settings.yml b/.github/settings.yml
@@ -36,15 +36,15 @@ repository:
 
   # Either `true` to allow squash-merging pull requests, or `false` to prevent
   # squash-merging.
-  allow_squash_merge: true
+  allow_squash_merge: false
 
   # Either `true` to allow merging pull requests with a merge commit, or `false`
   # to prevent merging pull requests with merge commits.
   allow_merge_commit: false
 
   # Either `true` to allow rebase-merging pull requests, or `false` to prevent
   # rebase-merging.
-  allow_rebase_merge: false
+  allow_rebase_merge: true
 
   # Either `true` to enable automatic deletion of branches on merge, or `false` to disable
   delete_branch_on_merge: true