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: [email protected]
For additional commands, e-mail: [email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
