From 63c19025ef3d38931835fdfd0799c5399c320d80 Mon Sep 17 00:00:00 2001
From: rubyowo <perhaps-you-know@what-is.ml>
Date: Mon, 3 Jul 2023 17:55:27 +0400
Subject: [PATCH] feat: make update script fail if merge conflict

---
 update.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/update.sh b/update.sh
index 676f1449..558750cf 100755
--- a/update.sh
+++ b/update.sh
@@ -4,6 +4,10 @@ echo Updating Zeppelin...
 
 docker compose -f docker-compose.production.yml stop
 git pull
+if [ $? -ne 0 ]; then
+  echo "git pull failed. exiting."
+  exit 1
+fi
 docker compose -f docker-compose.production.yml build
 docker compose -f docker-compose.production.yml up -d