[Opendnssec-develop] A successful Git branching model

[Sara Dickinson]

On 10 Dec 2013, at 10:00, Jerry Lundström <jerry at opendnssec.org> wrote:

> On Nov 14, 2013, at 15:32 , Matthijs Mekking wrote:
> 
>> This is the git model we are considering to use for NLnet Labs (Willem
>> already uses it for getdns-api)
>> 
>> http://nvie.com/posts/a-successful-git-branching-model/
>> 
>> It also explains Git shortly but nicely in a conceptual way.
> 
> 
> This is Git Flow that I mentioned before, I've been using it for many projects now for over a year.
> 

So all my reading to date indicates that this works really nicely if you have a single product version that you support. However I haven't found anything that describes how you easily use this if you have multiple production versions that you need to maintain (like we do). I can find some descriptions of how to do this e.g.

http://stackoverflow.com/questions/18220663/advice-on-multiple-release-lines-and-git-flow-for-git-non-gurus
http://stackoverflow.com/questions/16386323/following-git-flow-how-should-you-handle-a-hotfix-of-an-earlier-release

but this doesn't really look like what Git Flow was designed for. Jerry - do you have a specific workflow to present that does support maintenance of multiple production versions - is that what you will present tomorrow?

Sara. 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.opendnssec.org/pipermail/opendnssec-develop/attachments/20131210/f808f365/attachment.htm>