Skip to content

Commit

Permalink
Fix auto-merge tasks (dotnet#40309)
Browse files Browse the repository at this point in the history
  • Loading branch information
gewarren authored Apr 3, 2024
1 parent 210ec65 commit 0f8345a
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .github/policies/auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ configuration:
then:
- enableAutoMerge:
mergeMethod: Squash
triggerOnOwnActions: true
description: Auto-squash-merge PRs to main labeled with auto-merge
- if:
- payloadType: Pull_Request
Expand All @@ -27,6 +28,7 @@ configuration:
then:
- enableAutoMerge:
mergeMethod: Merge
triggerOnOwnActions: true
description: Auto-merge PRs to live labeled with auto-merge
- if:
- payloadType: Pull_Request
Expand Down

0 comments on commit 0f8345a

Please sign in to comment.