天天看點

AndroidStudio使用git更新時代碼丢失

在進行代碼更新時出現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

AndroidStudio使用git更新時代碼丢失

找到自己需要的stash點選Apply Stash丢失的代碼就回來了。