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

>>阅读原文<<