From f713889e5e5d0657787cf8abd58a368a97042146 Mon Sep 17 00:00:00 2001
From: Alicia Sykes <gh@d0h.co>
Date: Tue, 5 Oct 2021 11:34:50 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=8F=97=EF=B8=8F=20Adds=20action=20to=20de?=
 =?UTF-8?q?tect=20and=20label=20PR=20conflitcts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/check-merge-conflicts.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 .github/workflows/check-merge-conflicts.yml

diff --git a/.github/workflows/check-merge-conflicts.yml b/.github/workflows/check-merge-conflicts.yml
new file mode 100644
index 00000000..b193d8ce
--- /dev/null
+++ b/.github/workflows/check-merge-conflicts.yml
@@ -0,0 +1,16 @@
+# Detect and label pull requests that have merge conflicts
+name: 🏗️ Check Merge Conflicts
+on:
+  push:
+    branches:
+    - master
+jobs:
+  check-conflicts:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mschilde/auto-label-merge-conflicts@master
+        with:
+          CONFLICT_LABEL_NAME: "🚫 Merge Conflicts"
+          GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
+          MAX_RETRIES: 5
+          WAIT_MS: 5000