Commands only needed prior to release

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