title: Git merge conflict only on version tag in pom.xml
body: <p>Is there a way to avoid merge conflicts in version tag in <code>pom.xml</code> when merging master into a branch? I have quite a few pom files, 80, and all of them have same version which is different from one in master. It's laborious and time-consuming to execute <code>git mergetool</code> for 80 pom files just for a version tag. </p>