我遇到了合并冲突问题,使用的是 Mercurial 1.0.2 版本:
merging test.h
warning: conflicts during merge.
merging test.h failed!
6 files updated, 0 files merged, 0 files removed, 1 files unresolved
There are unresolved merges, you can redo the full merge using:
hg update -C 19
hg merge 18
我无法理解如何解决这个问题。谷歌搜索结果指示使用:
hg resolve
但由于某种原因,我的Mercurial(v1.0.2)没有resolve命令:
hg: unknown command 'resolve'
我该如何解决这个冲突?