Git 一些错误的解决方法

Git初学者的我的经验记录，仅供参考 1. Pull is not possible because you have unmerged files.git 症状：pull的时候app $ git pull spa Pull is not possible because you have unmerged files. Please, fix them up in the work tree,

>>阅读原文<<