git error: Your local changes to the following files would be overwritten by merge: Please commit your changes or stash them before you merge.解决办法

 

git pull操作出现的问题：

error: Your local changes to the following files would be overwritten by merge:
.idea/workspace.xml
.idea/zlhcec.com.iml
Please commit your changes or stash them before you merge.
Aborting

 

 

 

解决办法：

 

git reset --hard  实际操作可行

参考：

https://stackoverflow.com/questions/15745045/how-do-i-resolve-git-saying-commit-your-changes-or-stash-them-before-you-can-me