mercurial – 如何解决.hgtags冲突？

概述我无法将此冲突解决为.hgtags kd:friend-sup/ $cat .hgtags<<<<<<< MINE42569bf07912cd317b9305082d980cb64b318042 106.0042569bf07912cd317b9305082d980cb64b318042 106.0145846a087b03e656fcf1f986d39c095fbae2ed9e 106. 我无法将此冲突解决为.hgTags

kd:frIEnd-sup/ $cat .hgTags<<<<<<< mine42569bf07912cd317b9305082d980cb64b318042 106.0042569bf07912cd317b9305082d980cb64b318042 106.0145846a087b03e656fcf1f986d39c095fbae2ed9e 106.0245846a087b03e656fcf1f986d39c095fbae2ed9e 106.03c45c61fdfe20fa088a4418fef55ba93930d6dbe0 106.04c45c61fdfe20fa088a4418fef55ba93930d6dbe0 106.05c45c61fdfe20fa088a4418fef55ba93930d6dbe0 106.06c45c61fdfe20fa088a4418fef55ba93930d6dbe0 106.07||||||| ANCESTOR=======ea8e577c2cfc6538da32c16ba4248d27768223bd raw-qf-merge--main-trunk>>>>>>> OTHER

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

kd:frIEnd-sup/ $vi .hgTags

失败：

kd:frIEnd-sup/ $hg resolve .hgTagsmerging .hgTagsmerging .hgTags Failed!kd:frIEnd-sup/ $cat .hgTags<<<<<<< mine42569bf07912cd317b9305082d980cb64b318042 106.0042569bf07912cd317b9305082d980cb64b318042 106.0145846a087b03e656fcf1f986d39c095fbae2ed9e 106.0245846a087b03e656fcf1f986d39c095fbae2ed9e 106.03c45c61fdfe20fa088a4418fef55ba93930d6dbe0 106.04c45c61fdfe20fa088a4418fef55ba93930d6dbe0 106.05c45c61fdfe20fa088a4418fef55ba93930d6dbe0 106.06c45c61fdfe20fa088a4418fef55ba93930d6dbe0 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.

总结

以上是内存溢出为你收集整理的mercurial – 如何解决.hgtags冲突？全部内容，希望文章能够帮你解决mercurial – 如何解决.hgtags冲突？所遇到的程序开发问题。

如果觉得内存溢出网站内容还不错，欢迎将内存溢出网站推荐给程序员好友。