update: force git checkout to switch branch

(cherry picked from commit 2b1d78f28f28abedf1822cddf0021d24bf9c82a0)
2021-06-02 18:53:06 +02:00 · 2021-06-02 18:53:06 +02:00 · a23820e28d
parent 8877263371
commit a23820e28d
1 changed files with 1 additions and 1 deletions
--- a/scripts/bash/update.sh
+++ b/scripts/bash/update.sh
@ -19,7 +19,7 @@ function update(){
    sudo killall -15 raspimjpeg
    sudo killall -15 python3
    git stash
-    git merge
+    git checkout --force $BRANCH
    git checkout stash@'{0}' -- config.json hardware.json
    # TODO we need to change this to drop stash@{1} if changes made to the flow are to be restored by the user
    git stash drop