Skip to content

Commit

Permalink
Merge pull request #262 from Lombiq/issue/OSOE-699
Browse files Browse the repository at this point in the history
OSOE-699: Fine-tune retry config for actions-label-merge-conflict
  • Loading branch information
DemeSzabolcs authored Oct 5, 2023
2 parents e66447d + f3d1edd commit 7adb389
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .github/actions/check-merge-conflict/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ runs:
repoToken: ${{ env.GITHUB_TOKEN }}
commentOnDirty: "This pull request has merge conflicts. Please resolve those before requesting a review."
dirtyLabel: "Merge Conflict"
# The default 120 is too long. The mergeable state is usually calculated by GitHub within seconds.
retryAfter: 5

0 comments on commit 7adb389

Please sign in to comment.