Skip to content

Commit 958bc50

Browse files
committed
Update auto-merge-sync-pr.yml
1 parent 5946203 commit 958bc50

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

.github/policies/auto-merge-sync-pr.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ configuration:
1616
label: ':octocat: auto-merge'
1717
- targetsBranch:
1818
branch: main
19-
- isActivitySender:
20-
user: microsoft-github-policy-service[bot]
19+
- or:
20+
- isActivitySender:
21+
user: microsoft-github-policy-service[bot]
2122
then:
2223
- enableAutoMerge:
2324
mergeMethod: Squash
@@ -32,8 +33,9 @@ configuration:
3233
label: ':octocat: auto-merge'
3334
- targetsBranch:
3435
branch: live
35-
- isActivitySender:
36-
user: microsoft-github-policy-service[bot]
36+
- or:
37+
- isActivitySender:
38+
user: microsoft-github-policy-service[bot]
3739
then:
3840
- enableAutoMerge:
3941
mergeMethod: Merge

0 commit comments

Comments
 (0)