Skip to content

Commit

Permalink
Merge pull request #532 from MicrosoftDocs/localden/simpleevent
Browse files Browse the repository at this point in the history
Update auto-merge-sync-pr.yml
  • Loading branch information
localden authored Oct 30, 2024
2 parents f87f181 + 8ac8402 commit 9d0c7b5
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions .github/policies/auto-merge-sync-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@ configuration:
label: ':octocat: auto-merge'
- targetsBranch:
branch: main
- or:
- isActivitySender:
user: microsoft-github-policy-service[bot]
- isActivitySender:
user: microsoft-github-policy-service[bot]
then:
- enableAutoMerge:
mergeMethod: Squash
Expand All @@ -38,6 +37,8 @@ configuration:
then:
- enableAutoMerge:
mergeMethod: Merge
- approvePullRequest:
comment: "Approved; this PR will merge when all status checks pass."

- description: Don't auto-merge PRs with 'auto-merge' label removed
if:
Expand Down

0 comments on commit 9d0c7b5

Please sign in to comment.