Checkout master first

2016-11-12 11:16:52 +00:00 · 2016-11-12 11:16:52 +00:00 · 58793becf6
parent 7121c60452
commit 58793becf6
1 changed files with 2 additions and 0 deletions
--- a/src/freedombone-upgrade
+++ b/src/freedombone-upgrade
@ -66,6 +66,8 @@ if [ -d $PROJECT_DIR ]; then
        git merge --abort
        git stash
        # TODO after stockholm merge change this to git_pull
+        git checkout master
+        git pull $PROJECT_REPO
        git checkout stockholm
        git pull $PROJECT_REPO
        make install