You have not concluded your merge (MERGE_HEAD exists)
遇到这么一个问题:
You have not concluded your merge (MERGE_HEAD exists). Please, commit
your changes before you can merge.
问题的原因是, 以前的pull 之后merge 失败, git 进入conflict 状态。
解决办法:1) Undo the merge and pull a
转载
2015-09-17 11:42:40 ·
26453 阅读 ·
1 评论