From 9bec3480ed90376f12052b2933123aeab5a456ce Mon Sep 17 00:00:00 2001
From: Ankush Menat <ankush@frappe.io>
Date: Wed, 27 Apr 2022 14:25:45 +0530
Subject: [PATCH] ci: failfast in case of conflicts (#16777)

---
 .github/helper/install_dependencies.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/helper/install_dependencies.sh b/.github/helper/install_dependencies.sh
index d16f5b62ad..f0e8016860 100644
--- a/.github/helper/install_dependencies.sh
+++ b/.github/helper/install_dependencies.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
+
  # install wkhtmltopdf
 wget -O /tmp/wkhtmltox.tar.xz https://github.com/frappe/wkhtmltopdf/raw/master/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz
 tar -xf /tmp/wkhtmltox.tar.xz -C /tmp