From a23820e28dfd55050b076c844a1f8fbb203454e9 Mon Sep 17 00:00:00 2001
From: Romain Bazile <gromain.baz@gmail.com>
Date: Wed, 2 Jun 2021 18:53:06 +0200
Subject: [PATCH] update: force git checkout to switch branch

(cherry picked from commit 2b1d78f28f28abedf1822cddf0021d24bf9c82a0)
---
 scripts/bash/update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bash/update.sh b/scripts/bash/update.sh
index dc47719..4298198 100755
--- 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