mercurial – 如何解决.hgtags冲突？

发布时间：2020-12-20 11:20:33 所属栏目：Python 来源：网络整理

导读：我无法将此冲突解决为.hgtags kd:friend-sup/ $cat .hgtags MINE42569bf07912cd317b9305082d980cb64b318042 106.0042569bf07912cd317b9305082d980cb64b318042 106.0145846a087b03e656fcf1f986d39c095fbae2ed9e 106.0245846a087b03e656fcf1f986d39c095fbae2ed

我无法将此冲突解决为.hgtags

kd:friend-sup/ $cat .hgtags
<<<<<<< MINE
42569bf07912cd317b9305082d980cb64b318042 106.00
42569bf07912cd317b9305082d980cb64b318042 106.01
45846a087b03e656fcf1f986d39c095fbae2ed9e 106.02
45846a087b03e656fcf1f986d39c095fbae2ed9e 106.03
c45c61fdfe20fa088a4418fef55ba93930d6dbe0 106.04
c45c61fdfe20fa088a4418fef55ba93930d6dbe0 106.05
c45c61fdfe20fa088a4418fef55ba93930d6dbe0 106.06
c45c61fdfe20fa088a4418fef55ba93930d6dbe0 106.07
||||||| ANCESTOR
=======
ea8e577c2cfc6538da32c16ba4248d27768223bd raw-qf-merge--main-trunk
>>>>>>> OTHER

我尝试以各种方式编辑文件,删除标记,但无济于事.理想情况下,我想要来自MINE和OTHER的标签,所以只需删除标记即可.

kd:friend-sup/ $vi .hgtags

失败：

kd:friend-sup/ $hg resolve .hgtags
merging .hgtags
merging .hgtags failed!
kd:friend-sup/ $cat .hgtags
<<<<<<< MINE
42569bf07912cd317b9305082d980cb64b318042 106.00
42569bf07912cd317b9305082d980cb64b318042 106.01
45846a087b03e656fcf1f986d39c095fbae2ed9e 106.02
45846a087b03e656fcf1f986d39c095fbae2ed9e 106.03
c45c61fdfe20fa088a4418fef55ba93930d6dbe0 106.04
c45c61fdfe20fa088a4418fef55ba93930d6dbe0 106.05
c45c61fdfe20fa088a4418fef55ba93930d6dbe0 106.06
c45c61fdfe20fa088a4418fef55ba93930d6dbe0 106.07
||||||| ANCESTOR
=======
ea8e577c2cfc6538da32c16ba4248d27768223bd raw-qf-merge--main-trunk
>>>>>>> OTHER

解决方法

您希望将文件中的合并冲突标记为已解决,因此您应该使用-m选项：

hg resolve -m .hgtags

没有它,hg解析重试合并文件,覆盖手动更改.

hg解决的相关部分–help：

The resolve command can be used in the following ways:

“hg resolve [--tool TOOL] FILE...“: attempt to re-merge the specified
files,discarding any previous merge attempts. Re-merging is not
performed for files already marked as resolved. Use “–all/-a” to
selects all unresolved files. “--tool” can be used to specify the merge
tool used for the given files. It overrides the HGMERGE environment
variable and your configuration files.

“hg resolve -m [FILE]“: mark a file as having been resolved (e.g. after having manually fixed-up the files). The default is to mark all unresolved files.

（编辑：李大同）

【声明】本站内容均来自网络，其相关言论仅代表作者个人观点，不代表本站立场。若无意侵犯到您的权利，请及时与联系站长删除相关内容!