From what I understand of this model, you don't even develop on the dev
branch but on feature/bugfix branches, this allow you to cleanup your
commits (rebasing/squashing them first, sorry for the bad words, see [1] in
case) before merging the complete feature/bugfix on the develop branch, 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 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
