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. 事實(shí)上我已經(jīng)git stash 了谍憔,怎么破带猴?
Git出現(xiàn)沖突error: Your local changes to the following files would be overwritten by merge: xxx/...由于公司目前實(shí)行開發(fā)模塊化毁菱,所以原來用的SVN代碼管理器全部遷移到Git上去了,原來用過git現(xiàn)在已經(jīng)忘的差不多了赃泡,目前暫時(shí)用的是SourceTree來管理代碼的類似與SVN...