开发者

Default to trunk version for Mercurial merges?

开发者 https://www.devze.com 2023-02-13 00:59 出处:网络
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.

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.

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
p开发者_如何学Pythonom.xml = internal:local
**\pom.xml = internal:local


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
0

精彩评论

暂无评论...
验证码 换一张
取 消