From 3ae9fa98c4de9a1c016f6bcddd0b8ce5f1cbb5c5 Mon Sep 17 00:00:00 2001
From: Ankush Menat <ankush@frappe.io>
Date: Wed, 27 Apr 2022 14:33:26 +0530
Subject: [PATCH] ci: failfast when merge conflict exists (#30823)

[skip ci]
---
 .github/helper/install.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/helper/install.sh b/.github/helper/install.sh
index 859146bbcd..69749c93af 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