do_relase.sh: One more branching logic fix
This commit is contained in:
parent
620fc833e3
commit
50b5c7aa5f
1 changed files with 1 additions and 1 deletions
|
|
@ -13,7 +13,7 @@ fi
|
|||
|
||||
TIMESTAMP=${TIMESTAMP:-$(date +%y-%m-%d)}
|
||||
|
||||
git pull -X theirs --no-commit master
|
||||
#git pull -X theirs --no-commit master
|
||||
|
||||
make clean all
|
||||
git add svd mx_mcu_db prog_db chip_db
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue