From 837cc1542997f1fa197ed72a98bc7b5053f2f42f Mon Sep 17 00:00:00 2001 From: Frank Dana Date: Thu, 19 Nov 2020 08:41:43 -0500 Subject: [PATCH] Label merge conflicts: lower retry delay, raise retry count (#3852) --- .github/workflows/label-merge-conflicts.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/label-merge-conflicts.yml b/.github/workflows/label-merge-conflicts.yml index f1f971512e..12a5952de2 100644 --- a/.github/workflows/label-merge-conflicts.yml +++ b/.github/workflows/label-merge-conflicts.yml @@ -22,9 +22,9 @@ jobs: # Name of the label which indicates that the branch is dirty dirtyLabel: 'conflicts' # Number of seconds after which the action runs again if the mergable state is unknown. - retryAfter: 300 + retryAfter: 60 # Number of times the action retries calculating the mergable state - retryMax: 2 + retryMax: 5 # String. Comment to add when the pull request is conflicting. Supports markdown. commentOnDirty: 'Merge conflicts have been detected on this PR, please resolve.'