默认为Mercurial合并的主干版本? [英] Default to trunk version for Mercurial merges?

问题描述

当我们将Mercurial功能版本存储库中的更改合并到主干存储库中时，我们总是与Maven POM文件(pom.xml)和Mercurial .hgtags文件冲突.

When we merge changes from our Mercurial feature release repositories into our trunk repository, we always have conflicts with our Maven POM files(pom.xml) and our Mercurial .hgtags file.

我们始终希望保留主干版本-我们永远不希望功能发布回购版本.有合并冲突时，是否有任何方法告诉M​​ercurial始终使用这些文件的主干版本?

We always want to keep the trunk version - we never want the feature release repo version. Is there any way to tell Mercurial to always use the trunk version of these files when there are merge conflicts?

更新:根据所选答案，该方法有效:

Update: Per the selected answer, this works:

[merge-patterns]
.hgtags = internal:local
pom.xml = internal:local
**\pom.xml = internal:local

推荐答案

对于您的pom.xml文件，将合并工具设置为internal:local(如果未更新为您调用的internal:remote设置为internal:remote > trunk). 此处解释.
试试这个:

For your pom.xml file set the merge tool to internal:local (or internal:remote if you're not updated to what you're calling trunk). Explained here.
Try this:

[merge-patterns]
pom.xml = internal:local

这篇关于默认为Mercurial合并的主干版本?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！