Update auto-merge-sync-pr.yml

MicrosoftDocs · Oct 30, 2024 · 4ed2462 · 4ed2462
1 parent 8ac8402
commit 4ed2462
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/.github/policies/auto-merge-sync-pr.yml b/.github/policies/auto-merge-sync-pr.yml
@@ -16,8 +16,9 @@ configuration:
             label: ':octocat: auto-merge'
         - targetsBranch:
             branch: main
-        - isActivitySender:
-            user: microsoft-github-policy-service[bot]
+        - or:
+            - isActivitySender:
+                user: microsoft-github-policy-service[bot]
       then:
         - enableAutoMerge:
             mergeMethod: Squash
@@ -32,8 +33,9 @@ configuration:
             label: ':octocat: auto-merge'
         - targetsBranch:
             branch: live
-        - isActivitySender:
-            user: microsoft-github-policy-service[bot]
+        - or:
+            - isActivitySender:
+                user: microsoft-github-policy-service[bot]
       then:
         - enableAutoMerge:
             mergeMethod: Merge