From 3022581be8a97028724ffdad16ce6a3f97bc7c3f Mon Sep 17 00:00:00 2001
From: Noah Dietz <noahdietz@users.noreply.github.com>
Date: Tue, 26 Jul 2022 09:50:14 -0700
Subject: [PATCH] chore(settings): revert enablement of merge commit (#6421)

Fixes #6369
Fixes #6380
---
 .github/sync-repo-settings.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 55092e357339..212318780bce 100644
--- 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