From d3660b45b1bd32f3287cfc2816f47b423e19ff65 Mon Sep 17 00:00:00 2001 From: Gauvain <68083474+Gauvino@users.noreply.github.com> Date: Mon, 2 Jun 2025 13:52:12 +0200 Subject: [PATCH] fix: rename merge conflict label (#725) --- .github/workflows/conflict.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conflict.yml b/.github/workflows/conflict.yml index 6b2aa663..2699ccb7 100644 --- a/.github/workflows/conflict.yml +++ b/.github/workflows/conflict.yml @@ -19,6 +19,6 @@ jobs: - name: 🚩 Apply merge conflict label uses: eps1lon/actions-label-merge-conflict@v3.0.3 with: - dirtyLabel: 'merge conflict' + dirtyLabel: 'merge-conflict' commentOnDirty: 'This pull request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged.' repoToken: '${{ secrets.GITHUB_TOKEN }}'