Re: nvie branch model

2013-03-18 Thread Dasa Paddock
; Feature branches typically exist in developer repos only, not in origin. > > Except if it needs collaboration indeed. > > Anyway, at the end, each one will do with it's own experience, collaborating > on a feature is the best way to learn Git but we do more bugfixes. > > Th

Re: nvie branch model

2013-03-18 Thread Frédéric THOMAS
feature is the best way to learn Git but we do more bugfixes. Thanks for having shared that, -Fred -Message d'origine- From: Dasa Paddock Sent: Monday, March 18, 2013 10:02 PM To: Subject: Re: nvie branch model The nvie.com<http://nvie.com> git flow actually advocates not squashi

Re: nvie branch model

2013-03-18 Thread Dasa Paddock
for RC, once ok, the final release is tagged on the master. -Fred [1] http://www.atlassian.com/git/tutorial/git-basics -Message d'origine- From: Gordon Smith Sent: Monday, March 18, 2013 8:54 PM To: dev@flex.apache.org<mailto:dev@flex.apache.org> Subject: nvie branch mod

Re: nvie branch model

2013-03-18 Thread Erik de Bruin
; -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

Re: nvie branch model

2013-03-18 Thread Alex Harui
On 3/18/13 1:16 PM, "Erik de Bruin" wrote: > 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)

RE: nvie branch model

2013-03-18 Thread Gordon Smith
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 Subject: Re: nvie branch model I don't agree with that. I think w

Re: nvie branch model

2013-03-18 Thread Erik de Bruin
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) will make it easier to get help from the proponents a

Re: nvie branch model

2013-03-18 Thread Alex Harui
On 3/18/13 12:54 PM, "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 u

Re: nvie branch model

2013-03-18 Thread Erik de Bruin
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' be

Re: nvie branch model

2013-03-18 Thread Frédéric THOMAS
, the release branch is for RC, once ok, the final release is tagged on the master. -Fred [1] http://www.atlassian.com/git/tutorial/git-basics -Message d'origine- From: Gordon Smith Sent: Monday, March 18, 2013 8:54 PM To: dev@flex.apache.org Subject: nvie branch model My unders

nvie branch model

2013-03-18 Thread Gordon Smith
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 wit