update-reset: checkout with --force.
Otherwise it won't overwrite unmerged changes.
This commit is contained in:
parent
1f97e3186a
commit
3c91f5858a
@ -37,7 +37,7 @@ EOS
|
||||
echo
|
||||
|
||||
echo "==> Resetting $DIR..."
|
||||
git checkout -B master origin/master
|
||||
git checkout --force -B master origin/master
|
||||
echo
|
||||
done
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user