Skip to content

Commit ad72ae0

Browse files
committed
try to fix auto-merge
1 parent 858e24b commit ad72ae0

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

.github/policies/auto-merge.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ configuration:
1919
- or:
2020
- isActivitySender:
2121
user: dotnet-policy-service[bot]
22+
- isActivitySender:
23+
user: dotnet-policy-service
2224
then:
2325
- enableAutoMerge:
2426
mergeMethod: Squash
@@ -33,8 +35,11 @@ configuration:
3335
label: ':octocat: auto-merge'
3436
- targetsBranch:
3537
branch: live
36-
- isActivitySender:
37-
user: dotnet-policy-service[bot]
38+
- or:
39+
- isActivitySender:
40+
user: dotnet-policy-service[bot]
41+
- isActivitySender:
42+
user: dotnet-policy-service
3843
then:
3944
- enableAutoMerge:
4045
mergeMethod: Merge

0 commit comments

Comments
 (0)