git:merge对比合并
有冲突没有解决:没有进行版本合并
You have not concluded your merge (MERGE_HEAD exists)
合并期间不能做局部的提交
fatal: cannot do a partial commit during a merge.
有冲突没有解决:没有进行版本合并
You have not concluded your merge (MERGE_HEAD exists)
合并期间不能做局部的提交
fatal: cannot do a partial commit during a merge.