diff --git a/.github/policies/auto-merge-sync-pr.yml b/.github/policies/auto-merge-sync-pr.yml index dfb8c0c0..86200653 100644 --- 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