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: