From 8bf7683861463349c014b713d7d5c5c1ba95cecf Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Sat, 5 Nov 2016 17:09:09 +0000
Subject: [PATCH] Commands only needed prior to release

---
 src/freedombone-upgrade | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/freedombone-upgrade b/src/freedombone-upgrade
index 05f044d8..b839f0d9 100755
--- a/src/freedombone-upgrade
+++ b/src/freedombone-upgrade
@@ -65,6 +65,8 @@ if [ -d $PROJECT_DIR ]; then
         rm -rf $PROJECT_DIR/locale/*
         git checkout stockholm
         # TODO after stockholm merge change this to git_pull
+        git merge --abort
+        git stash
         git pull $PROJECT_REPO
         make install
         ${PROJECT_NAME} -c $CONFIGURATION_FILE