From 572c51a3e1c1d1242c445a6300a3b224dbadb68e Mon Sep 17 00:00:00 2001
From: Tomaae <23486452+tomaae@users.noreply.github.com>
Date: Wed, 22 Apr 2020 18:34:31 +0200
Subject: [PATCH] workflow for checking PR conflicts

---
 .github/workflows/conflicts.yml | 13 +++++++++++++
 1 file changed, 13 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 0000000..f28b1cc
--- /dev/null
+++ b/.github/workflows/conflicts.yml
@@ -0,0 +1,13 @@
+on:
+  push:
+  pull_request:
+      types: [opened, synchronize, reopened]
+jobs:
+  check_conflicts:
+    name: Check for PR merge conflicts
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mschilde/auto-label-merge-conflicts@master
+        with:
+          CONFLICT_LABEL_NAME: "conflict"
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}