From e765d68e13a818861fd712faf56dc565a7426225 Mon Sep 17 00:00:00 2001
From: David Thompson <davthomp@redhat.com>
Date: Mon, 29 Jun 2026 16:50:25 -0400
Subject: [PATCH] [WIP] fix conflict detection

Bump the action version to a commit that addresses the root cause

Signed-off-by: David Thompson <davthomp@redhat.com>
---
 .github/workflows/conflictDetector.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/conflictDetector.yaml b/.github/workflows/conflictDetector.yaml
index 15a95fd88..afa7436c8 100644
--- a/.github/workflows/conflictDetector.yaml
+++ b/.github/workflows/conflictDetector.yaml
@@ -6,7 +6,7 @@ jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
-      - uses: mschilde/auto-label-merge-conflicts@8c6faa8a252e35ba5e15703b3d747bf726cdb95c
+      - uses: mschilde/auto-label-merge-conflicts@cd484bbf0476fbe79474a937681a253e094cac3d
         with:
           CONFLICT_LABEL_NAME: "has conflicts"
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}