Skip to content

Commit

Permalink
try to fix auto-merge (#41690)
Browse files Browse the repository at this point in the history
  • Loading branch information
gewarren authored Jul 10, 2024
1 parent 86f9c72 commit 2f77f60
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .github/policies/auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ configuration:
then:
- enableAutoMerge:
mergeMethod: Squash
- approvePullRequest:
comment: "Approved; this PR will merge when all status checks pass."

- description: Auto-merge PRs to live labeled with auto-merge
triggerOnOwnActions: true
Expand Down
2 changes: 0 additions & 2 deletions .github/policies/label-prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ configuration:
- isActivitySender:
user: azure-sdk
then:
- approvePullRequest:
comment: "Approved; this PR will merge when all status checks pass."
- addLabel:
label: ':octocat: auto-merge'

Expand Down

0 comments on commit 2f77f60

Please sign in to comment.