git pull报错信息：error: Your local changes to the following files would be overwritten by merge: .idea/workspace.xml Please commit your changes or stash them before you merge. Aborting Updating a4ea25c…be818f9 解决办法 1.不想要保存本地更改 直接将本地的状态恢复到上一个commit id 。然后用远程的代码直接覆盖本地
git reset --hard git pull origin master