From a17c04619bcc60c963ddbf92254b9acf8abcf901 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Sun, 9 Oct 2022 12:21:49 +0300
Subject: [PATCH] Create Conflict marking

---
 .github/workflows/Conflict marking | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 .github/workflows/Conflict marking

diff --git a/.github/workflows/Conflict marking b/.github/workflows/Conflict marking
new file mode 100644
index 0000000000..46afd8996d
--- /dev/null
+++ b/.github/workflows/Conflict marking	
@@ -0,0 +1,21 @@
+name: "Conflict marking"
+on:
+  # So that PRs touching the same files as the push are updated
+  push:
+  # So that the `dirtyLabel` is removed if conflicts are resolve
+  # We recommend `pull_request_target` so that github secrets are available.
+  # In `pull_request` we wouldn't be able to change labels of fork PRs
+  pull_request_target:
+    types: [synchronize]
+
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    steps:
+      - name: check conflicting PRs
+        uses: eps1lon/actions-label-merge-conflict@releases/2.x
+        with:
+          dirtyLabel: "Conflicts"
+          repoToken: "${{ secrets.GITHUB_TOKEN }}"
+          commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
+          commentOnClean: "Conflicts have been resolved."