From fe3bd2e35dae37ce3903db7f7de86dd434e9ee57 Mon Sep 17 00:00:00 2001
From: Bill Thornton <billt2006@gmail.com>
Date: Tue, 1 Dec 2020 10:01:56 -0500
Subject: [PATCH] Add github action to label PRs with merge conflicts

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

diff --git a/.github/workflows/merge-conflicts.yml b/.github/workflows/merge-conflicts.yml
new file mode 100644
index 0000000000..c268c5fc3f
--- /dev/null
+++ b/.github/workflows/merge-conflicts.yml
@@ -0,0 +1,14 @@
+name: "Merge Conflicts"
+
+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 }}