I have a maven project which have 2 git branches (master and develop), each branch have different maven artifact Id in the pom.xml.
So when i branch out and merge back between master and develop how do i make sure 2 branches have their own pom.xml unchanged. only the rest of the changes are moved around?