chore: Resolve merge conflict

Author: sqrrrl

.github/sync-repo-settings.yaml

@@ -34,21 +34,6 @@ branchProtectionRules:
       - "conventionalcommits.org"
     requiredApprovingReviewCount: 1
     requiresCodeOwnerReviews: true
-  - pattern: master
-    isAdminEnforced: false
-    requiresStrictStatusChecks: false
-    requiredStatusCheckContexts:
-      # .github/workflows/test.yml with a job called "test"
-      - "test"
-      # .github/workflows/lint.yml with a job called "lint"
-      - "lint"
-      # Google bots below
-      - "cla/google"
-      - "snippet-bot check"
-      - "header-check"
-      - "conventionalcommits.org"
-    requiredApprovingReviewCount: 1
-    requiresCodeOwnerReviews: true
 permissionRules:
   - team: workspace-devrel-dpe
     permission: admin

.github/workflows/automation.yml

@@ -58,12 +58,12 @@ jobs:
       - if: ${{ env.DEFAULT_BRANCH == 'main' && env.HAS_MASTER_BRANCH == 'true' }}
         name: Update master branch from main
         run: |
-          git checkout master
+          git checkout -B master
           git reset --hard origin/main
           git push origin master
       - if: ${{ env.DEFAULT_BRANCH == 'master'}}
         name: Update main branch from master
         run: |
-          git checkout -b main
+          git checkout -B main
           git reset --hard origin/master
           git push origin main