From 9c985c1c2f06e71c6aee472df77040d24e3238c6 Mon Sep 17 00:00:00 2001 From: xLinka Date: Tue, 23 Sep 2025 13:16:10 +0100 Subject: [PATCH] Update conflicts.yml --- .github/workflows/conflicts.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conflicts.yml b/.github/workflows/conflicts.yml index 63e08c4..3e1dd0e 100644 --- a/.github/workflows/conflicts.yml +++ b/.github/workflows/conflicts.yml @@ -10,7 +10,9 @@ jobs: triage: runs-on: ubuntu-latest steps: - - uses: mschilde/auto-label-merge-conflicts@v2.0 + - uses: mschilde/auto-label-merge-conflicts@master with: CONFLICT_LABEL_NAME: "Has Conflicts" - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + MAX_RETRIES: 5 + WAIT_MS: 5000