git merge 分支遇到的问题

今天git merge lijiacy遇到个问题。
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 can merge.
Aborting

各种百度谷歌得出下面结论

git stash
git pull
git stash pop
git reset --hard
git pull
git clean -d -fx ".idea/workspace.xml "
git merge lijiacy

搞定