Skip to content

Commit 837cc15

Browse files
authored
Label merge conflicts: lower retry delay, raise retry count (#3852)
1 parent 8772295 commit 837cc15

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.github/workflows/label-merge-conflicts.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222
# Name of the label which indicates that the branch is dirty
2323
dirtyLabel: 'conflicts'
2424
# Number of seconds after which the action runs again if the mergable state is unknown.
25-
retryAfter: 300
25+
retryAfter: 60
2626
# Number of times the action retries calculating the mergable state
27-
retryMax: 2
27+
retryMax: 5
2828
# String. Comment to add when the pull request is conflicting. Supports markdown.
2929
commentOnDirty: 'Merge conflicts have been detected on this PR, please resolve.'
3030

0 commit comments

Comments
 (0)