需求: 解决git更新本地冲突,commit your changes or stash them before you can merge
两种方法
- stash(暂存)
git stash
git pull
git stash pop
git stash
: https://git-scm.com/docs/git-stash
- 直接完全覆盖本地修改
git reset --hard # !!! the code wrote before locally would be deleted
git pull