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 cause a merge conflict.
You might think of solutions for easy cases, but think about several releases
from the maint branches and several major releases in the same time frame and
you will run into merge conflicts.
Still, do you know any best practice how to deal with these? Do you know
examples from other language environments that also keep the version numbers
under version control and suffer from the same problem? Or is the version
number somehow taken from the git tag in your environment?
Thomas Koch, http://www.koch.ro
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html