From fd1850116273c1a44df68fbfb06422b3a0605224 Mon Sep 17 00:00:00 2001
From: Lars Kiesow <lkiesow@uos.de>
Date: Thu, 3 Aug 2023 08:53:26 +0200
Subject: [PATCH] Notify pull request authors about merge conflicts (#732)

This patch adds a GitHub Actions workflow to automatically notify pull
request authors about merge conflicts by commenting at and labeling the
pull request.
---
 .github/workflows/check-merge-conflict.yml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 .github/workflows/check-merge-conflict.yml

diff --git a/.github/workflows/check-merge-conflict.yml b/.github/workflows/check-merge-conflict.yml
new file mode 100644
index 000000000..720365eb5
--- /dev/null
+++ b/.github/workflows/check-merge-conflict.yml
@@ -0,0 +1,21 @@
+name: Merge conflict check
+on:
+  push:
+  pull_request_target:
+    types:
+      - opened
+      - synchronize
+
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check for dirty pull requests
+        uses: eps1lon/actions-label-merge-conflict@releases/2.x
+        with:
+          dirtyLabel: "status:conflicts"
+          repoToken: "${{ secrets.GITHUB_TOKEN }}"
+          commentOnDirty: |
+              This pull request has conflicts ☹
+              Please resolve those so we can review the pull request.
+              Thanks.