commit 3ae9fa98c4de9a1c016f6bcddd0b8ce5f1cbb5c5
author Ankush Menat <ankush@frappe.io> Wed Apr 27 14:33:26 2022 +0530
committer GitHub <noreply@github.com> Wed Apr 27 14:33:26 2022 +0530
tree 935eead297b600767a24970e8d0981df1b82382e
parent 85e8dd9a4960980e1ce681d942016f68081493e0

ci: failfast when merge conflict exists (#30823)

[skip ci]

.github/helper/install.sh

diff --git a/.github/helper/install.sh b/.github/helper/install.sh
index 859146b..69749c9 100644
--- a/.github/helper/install.sh
+++ b/.github/helper/install.sh
@@ -2,6 +2,13 @@
 
 set -e
 
+# Check for merge conflicts before proceeding
+python -m compileall -f "${GITHUB_WORKSPACE}"
+if grep -lr --exclude-dir=node_modules "^<<<<<<< " "${GITHUB_WORKSPACE}"
+    then echo "Found merge conflicts"
+    exit 1
+fi
+
 cd ~ || exit
 
 sudo apt-get install redis-server libcups2-dev