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

>>阅读原文<<