curious.bio/planktoscope
curious.bio/planktoscope
9
0
Fork 0
Code Issues 10 Pull requests Packages Projects 7 Releases Wiki Activity

update: force git checkout to switch branch

Browse source 
(cherry picked from commit 2b1d78f28f28abedf1822cddf0021d24bf9c82a0)
This commit is contained in:
Romain Bazile 2021-06-02 18:53:06 +02:00 committed by Romain Bazile
parent 8877263371
commit a23820e28d
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/bash/update.sh
View file

@ -19,7 +19,7 @@ function update(){
sudo killall -15 raspimjpeg sudo killall -15 raspimjpeg
sudo killall -15 python3 sudo killall -15 python3
git stash git stash
git merge git checkout --force $BRANCH
git checkout stash@'{0}' -- config.json hardware.json 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 # 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 git stash drop