CODEWITHSUNDEEP
mercurialmergepom.xml
Marcus Leon
Marcus Leon

Reputation: 56699

Mercurial merge - auto merging certain conflict patterns

We merge Maven pom.xml files from one repository to another.

The pom.xml files list a version in this form:

<version>5.0.17-SNAPSHOT</version>

Where we have a conflict on this line we always want to use the local file's version of the conflict. Is there a way to automatically take the local file version of the change?

For any other conflicts, we would like to continue to use the standard manual merge process.

Upvotes: 2

Views: 464

Answers (1)

Ry4an Brase
Ry4an Brase

Reputation: 78350

Sure. Check out the Merge Tool Configuration wiki page and you'll see that something like this should do it:

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

Upvotes: 2

Related Questions