在進行代碼更新時出現update cancel的提示,並且自己辛苦擼的代碼瞬間消失了,唯一欣慰的是還有警告
Local changes were not restored Before update your uncommitted changes were saved to stash.
Update is not complete, you have unresolved merges in your working tree
Resolve conflicts, complete update and restore changes manually.
失敗的原因就是代碼文件衝突,需要手動解決,修改的代碼保存到stash庫了,這就不怕了,找到他拉出來就好了。
vcs----------git----------------UnStash Changes
找到自己需要的stash點擊Apply Stash丟失的代碼就回來了。