From ae84885d9b6b62dc58ccd300e9ab321a3fd9f9c7 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 18 Apr 2025 20:23:32 -0700
Subject: [PATCH] workflows/conflicts: init (#6845)

Add labeler for merge conflicts
---
 .github/workflows/conflicts.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 .github/workflows/conflicts.yml

diff --git a/.github/workflows/conflicts.yml b/.github/workflows/conflicts.yml
new file mode 100644
index 000000000..dde28248c
--- /dev/null
+++ b/.github/workflows/conflicts.yml
@@ -0,0 +1,14 @@
+on:
+  push:
+    branches:
+      - master
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mschilde/auto-label-merge-conflicts@master
+        with:
+          CONFLICT_LABEL_NAME: "merge conflict"
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          MAX_RETRIES: 5
+          WAIT_MS: 10000