chore(settings): revert enablement of merge commit (#6421)

Fixes #6369 Fixes #6380
googleapis · Jul 26, 2022 · 3022581 · 3022581
1 parent 2971037
commit 3022581
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
@@ -1,6 +1,6 @@
 rebaseMergeAllowed: true
 squashMergeAllowed: true
-mergeCommitAllowed: true
+mergeCommitAllowed: false
 branchProtectionRules:
 - pattern: main
   isAdminEnforced: true
@@ -19,7 +19,7 @@ branchProtectionRules:
     - 'cla/google'
   requiredApprovingReviewCount: 1
   requiresStrictStatusChecks: true
-  requiresLinearHistory: false
+  requiresLinearHistory: true
 permissionRules:
   - team: actools
     permission: admin