Merging between branches but keep versions intact?

[motes motes <mo...@gmail.com>]

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: users-unsubscribe@maven.apache.org
For additional commands, e-mail: users-help@maven.apache.org

Re: Merging between branches but keep versions intact?

[Baptiste MATHUS <ml...@batmat.net>]

+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" <ed...@gmail.com> 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 <mo...@gmail.com> 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: users-unsubscribe@maven.apache.org
> > For additional commands, e-mail: users-help@maven.apache.org
> >
> >
>

Re: Merging between branches but keep versions intact?

[Ed Hillmann <ed...@gmail.com>]

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 <mo...@gmail.com> 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: users-unsubscribe@maven.apache.org
> For additional commands, e-mail: users-help@maven.apache.org
>
>

Re: Merging between branches but keep versions intact?

[Mark Derricutt <ma...@talios.com>]

Git-flow is your friend.  A very nice automated branching model for 
working with feature/release branches.

I made a short intro video some time ago:

http://vimeo.com/16018419

The AVH branch is the most up to date maintained version:

http://blog.avirtualhome.com/git-flow-avh-edition-1-3-0-released/


motes motes 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: users-unsubscribe@maven.apache.org
> For additional commands, e-mail: users-help@maven.apache.org
>


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@maven.apache.org
For additional commands, e-mail: users-help@maven.apache.org