Browse Source

Checkout master first

Bob Mottram 8 years ago
parent
commit
58793becf6
1 changed files with 2 additions and 0 deletions
  1. 2
    0
      src/freedombone-upgrade

+ 2
- 0
src/freedombone-upgrade View File

@@ -66,6 +66,8 @@ if [ -d $PROJECT_DIR ]; then
66 66
         git merge --abort
67 67
         git stash
68 68
         # TODO after stockholm merge change this to git_pull
69
+        git checkout master
70
+        git pull $PROJECT_REPO
69 71
         git checkout stockholm
70 72
         git pull $PROJECT_REPO
71 73
         make install