Gordon, Yes, to me this seems like the way to go. We work in 'develop' and once we think we're ready for 1.0, we cut a release branch, make that work and once done merge all of that into 'master' and tag it 1.0. Until then, we ignore 'master' ;-)
EdB -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl (http://www.ixsoftware.nl) On Monday, March 18, 2013 at 21:25, Gordon Smith wrote: > Erik, are you OK with just doing everything on a 'develop' branch? > > - Gordon > > -----Original Message----- > From: Erik de Bruin [mailto:e...@ixsoftware.nl] > Sent: Monday, March 18, 2013 1:16 PM > To: dev@flex.apache.org (mailto:dev@flex.apache.org) > Subject: Re: nvie branch model > > I don't agree with that. I think we need 'develop' if for nothing else that > set us up correctly from the start. Not sure about Mike, but you, Gordon and > me are all absolute beginners on git, and following the agreed upon > procedures (nvie.com (http://nvie.com)) will make it easier to get help from > the proponents and attract contributors. > > > EdB > > > > -- > Ix Multimedia Software > > Jan Luykenstraat 27 > 3521 VB Utrecht > > T. 06-51952295 > I. www.ixsoftware.nl (http://www.ixsoftware.nl) > > > > On Monday, March 18, 2013 at 21:12, Alex Harui wrote: > > > > > > > > > On 3/18/13 12:54 PM, "Gordon Smith" <gosm...@adobe.com > > (mailto:gosm...@adobe.com)> wrote: > > > > > My understanding is that we've decided to follow > > > > > > http://nvie.com/posts/a-successful-git-branching-model/ > > > > > > but the first diagram looks like spaghetti to me. There are > > > relatively few people working in the flex-falcon repo, and I'd like > > > to understand what we have to do to be minimally compliant with the > > > nvie model. Is it sufficient to simply create a 'develop' branch in > > > addition to 'master' and then do development there? Would we delay > > > merging to 'master' until we reach a 1.0 release? > > > > > > > > > > Yes, that is the minimum required. I'm ok waiting to do all of that > > until we actually cut a first Falcon release. > > > > -- > > Alex Harui > > Flex SDK Team > > Adobe Systems, Inc. > > http://blogs.adobe.com/aharui >
