..." to mark resolution)1.问题描述2.解决方案">
git问题之Unmerged paths: (use "git add ..." to mark resolution)1.问题描述2.解决方案
1.问题描述MacBook-Pro:gupaoedu gaoxinfu$ git pullerror: Pulling is not possible because you have unmerged files.hint: Fix them up in the work tree, and then use 'git add/rm <file>'hint: as appro...
