Re: Merge conflicts with version numbers in release branches

2013-05-29 Thread Enrico Weigelt
Thomas Koch wrote: it's a common problem[1,2,3] in Maven (Java) projects and probably in other environments too: You have the version number of your project written in the pom.xml. When one merges changes upwards from the maint branche to master, the version numbers in maint and master are

Merge conflicts with version numbers in release branches

2013-04-07 Thread Thomas Koch
Hi, it's a common problem[1,2,3] in Maven (Java) projects and probably in other environments too: You have the version number of your project written in the pom.xml. When one merges changes upwards from the maint branche to master, the version numbers in maint and master are different and