git stash pop 操作,提示error: Your local changes to the following files would be overwritten by merge:....Please commit your changes or stash them before you merge. 事实上我已经git stash 了,怎么破?
Git出现冲突error: Your local changes to the following files would be overwritten by merge: xxx/...由于公司目前实行开发模块化,所以原来用的SVN代码管理器全部迁移到Git上去了,原来用过git现在已经忘的差不多了,目前暂时用的是SourceTree来管理代码的类似与SVN...