Question

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
pom.xml = internal:local
**\pom.xml = internal:local

Answer 1

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