Gordon, This is my understanding as well (create 'develop' branch remotely, nothing else). The way I see it, at least at this point in Apache Flex's use of git, the purple 'feature' branches are local branches (on your machine only), which you, when done, merge back into your local 'develop' before pushing that to the remote 'develop'.
No idea who's supposed to create that remote 'develop', however… 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 20:54, Gordon Smith 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? > > - Gordon
