1 files changed, 4 insertions(+), 1 deletions(-)

M deploy.sh

@@ 1,9 1,12 @@
 #!/usr/bin/env bash
+
+set -e
+
 bin/fetch_latest_data.py
 
 ssh -t dutchfirecalc@s1.dvk.co "\
     cd ~/dutchfirecalc.nl; \
-    git pull; \
+    git pull -X theirs; \
     source ~/.cargo/env; \
     cargo build --release; \
     sudo systemctl restart dutchfirecalc; \