Force git custom merge driver for the purpose of merging pom.xml (maven) files

Question

I\'ve got a custom git merge driver configured for pom.xml (Maven) files.

The configuration:

The .gitattributes

Answer 1

What you want is a custom merge strategy, and you have defined a merge driver.

A driver is called only on conflicts, while a strategy is used anytime two commits are merged.

See this answer for how to set up your solution:

https://stackoverflow.com/a/23140455/6084013