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