Merge pull request #28038 from meeseeksmachine/auto-backport-of-pr-28023-on-v3.9.x

rcomer · web-flow · commit 03c94a2e1ab7 · 2024-04-07T17:26:15.000+01:00
Backport PR #28023 on branch v3.9.x (ci: Update merge conflict labeler)
diff --git a/.github/workflows/conflictcheck.yml b/.github/workflows/conflictcheck.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check if PRs have merge conflicts
-        uses: eps1lon/actions-label-merge-conflict@releases/2.x
+        uses: eps1lon/actions-label-merge-conflict@e62d7a53ff8be8b97684bffb6cfbbf3fc1115e2e  # v3.0.0
         with:
           dirtyLabel: "status: needs rebase"
           repoToken: "${{ secrets.GITHUB_TOKEN }}"
