From 58b65e15d33289e0697f57a09aae08a1f4428354 Mon Sep 17 00:00:00 2001
From: Tim Swast <swast@google.com>
Date: Tue, 29 Mar 2022 15:44:22 -0500
Subject: [PATCH] chore: add branch protection rules for v2

---
 .github/sync-repo-settings.yaml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 73cc3bcef..220c031b2 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -1,6 +1,5 @@
 # https://github.com/googleapis/repo-automation-bots/tree/main/packages/sync-repo-settings
-# Allow merge commits to sync main and v3 with fewer conflicts.
-mergeCommitAllowed: true
+mergeCommitAllowed: false
 # Rules for main branch protection
 branchProtectionRules:
 # Identifies the protection rule pattern. Name of the branch to be protected.
@@ -16,8 +15,8 @@ branchProtectionRules:
     - 'Samples - Lint'
     - 'Samples - Python 3.7'
     - 'Samples - Python 3.8'
-- pattern: v3
-  requiresLinearHistory: false
+- pattern: v2
+  requiresLinearHistory: true
   requiresCodeOwnerReviews: true
   requiresStrictStatusChecks: true
   requiredStatusCheckContexts: