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

git报错

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

解决办法

phpstorm的操作

 1.在整个项目上右键-【git】-【Repository】-【Stash Changes】 然后按照默认设置直接点击 【Create Stash】

2.在直接进行pull操作

在整个项目上右键-【git】-【Repository】-【Pull】

参考资料

Git 工具 - 储藏（Stashing）