I recently searched for a way to merge pom.xml-s automatically with Git merge driver. Got it working locally, but now I'd like to add this solution to Jenkins -- no luck so far.
What I did:
1) I added these lines to /root/.gitconfig :
[merge "pommerge"] name = A custom merge driver for Maven's pom.xml driver = /usr/bin/mergepom.py %O %A %B
2) Created .gitattributes file in the same directory and added line:
3) Moved mergepom.py to /usr/bin