On Tue, May 21, 2013 at 04:54:21AM -0700, Tony Quilkey wrote: > Hi, > > I am looking at formulating and then documenting our vcs workflow > using Git at work. I have an idea of how I want things to work, but > am a little hazy on some of the details. > > Our basic workflow will be based around: > http://nvie.com/posts/a-successful-git-branching-model, with a few > exceptions. > > We would like to create our release-* branches from the last release > tag. From there, we would like the ability to cherry pick (or take > the complete diff) commits from the develop branch. > > So, we are after is: > > 1) Create topic (feature) branches from develop, and merge back into > develop when complete. > > 2) Once it is decided we are packaging a release, make a release-* > branch from the previous release tag. > > 3) Cherry pick/merge/whatever any commits we want from develop into > the new release-* until it is complete. > > 4) Merge the new release-* branch into master and tag it. > > Repeat as necessary. > > At the moment I am a little stuck on how exactly we can cherry pick > stuff from develop into a release-* branch. I'm not even sure this > approach is exactly what we should be doing. > > Our main concern is that at this stage, there is no guarantee that all > commits within develop can be pulled into a release. > > In regards to how we can achieve the above results any input would > be much appreciated. Or if there are any other better options > available, I'm all ears.
A branching strategy should spring from your needs. Since you are basing it on http://nvie.com/posts/a-successful-git-branching-model/ I'm guessing you work on a product that's released fairly infrequently and you only plan on providing support for the latest released version. Is that right? /M -- Magnus Therning OpenPGP: 0xAB4DFBA4 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe http://therning.org/magnus Most software today is very much like an Egyptian pyramid with millions of bricks piled on top of each other, with no structural integrity, but just done by brute force and thousands of slaves. -- Alan Kay
Description: PGP signature