From b8c87219aa41afe64457d05f1314d1356daa7a58 Mon Sep 17 00:00:00 2001
From: KTrain5369 <69028025+KTrain5169@users.noreply.github.com>
Date: Mon, 26 Aug 2024 20:35:18 +1000
Subject: [PATCH] fix: swap out conflict label action

---
 .github/workflows/pr_management.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/pr_management.yml b/.github/workflows/pr_management.yml
index 580465d..0ac2ce0 100644
--- a/.github/workflows/pr_management.yml
+++ b/.github/workflows/pr_management.yml
@@ -28,12 +28,14 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           config-path: .github/labeler.yml
-      - name: Label PR if it cannot be merged
-        if: github.event.action == 'opened' || github.event.action == 'synchronise'
-        id: merge-conflict-check
-        uses: prulloac/configurable-pr-labeler@v1.1.2
+
+      - name: Label & comment if PR has conflict
+        uses: eps1lon/actions-label-merge-conflict@v3.0.2
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+            dirtyLabel: "Merge conflict identified"
+            repoToken: "${{ secrets.GITHUB_TOKEN }}"
+            commentOnDirty: "This pull request has conflicts with the base branch, which is ${{ github.base_ref }}. Please resolve them."
+            commentOnClean: "Resolved conflicts!"
 
       - name: Assign/unassign reviewers
         if: github.event.action == 'ready_for_review'