+1 with the fact pom.xml are only files for git (or svn). So this is actually not a Maven release plugin question, but more a git one. It's up to you to know which commit you want to merge with. Might be difficult though (easier than with svn though ;)). Cherry-picking could be a solution but would be quite a bit ugly regarding your commit graph...
Cheers Le 20 févr. 2013 23:17, "Ed Hillmann" <[email protected]> a écrit : > I know my experience when merging between branches (using subversion > instead of git) is that the version can get merged across if it's part of > the change. From the way I understand it, the version control system > doesn't know a POM file is a project file. It's a text file, like any > other text files. Typically, though, the changes to the versions come up > as conflicts which I just ignore. So, it hasn't been a massive problem to > deal with, even in the cases where it's not automatic. > > Hope this helps. > Ed > > > On Thu, Feb 21, 2013 at 3:28 AM, motes motes <[email protected]> wrote: > > > We are working on automating a branch/release plan using git and > > nexus. Using the maven-release-plugin is pretty simple for creating > > tags. > > > > But we also need to have multiple branches and merge between these > > branches during development up to a release. Further these branches > > needs to have separate versions so they don't get mixed up when > > deploying to nexus. > > > > The problem is that a merge from one branch to another should NOT > > overwrite the versions. Anyone facing the same challenges - merging > > between branches but keep the versions intact? > > > > --------------------------------------------------------------------- > > To unsubscribe, e-mail: [email protected] > > For additional commands, e-mail: [email protected] > > > > >
