From 958bc503d318344c7ce6387bd2a5f2e40938f831 Mon Sep 17 00:00:00 2001 From: "den (work)" <53200638+localden@users.noreply.github.com> Date: Wed, 30 Oct 2024 14:41:06 -0700 Subject: [PATCH] Update auto-merge-sync-pr.yml --- .github/policies/auto-merge-sync-pr.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/policies/auto-merge-sync-pr.yml b/.github/policies/auto-merge-sync-pr.yml index dfb8c0c..8620065 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