git放弃本地修改,直接覆盖(报错:error: Your local changes to the following files would be overwritten by merge) git reset --hard git pull