What harm (other than a little more work) would it do to NOT have that exception in that documentation? We're trying to keep the instructions simple and generic...
EdB On Fri, Mar 22, 2013 at 11:26 AM, Frédéric THOMAS <webdoubl...@hotmail.com> wrote: > I totaly agreed with that, the only exception is a single line of code/text > which doesn't need tests. > > -Fred > > -----Message d'origine----- From: Erik de Bruin > Sent: Friday, March 22, 2013 11:23 AM > > To: dev@flex.apache.org > Subject: Re: [OT] Log history > > I don't agree. I think all work should be done on a 'feature' branch - > there is no inherent difference between changing code to create a new > feature and changing code to fix a bug. Also, more then one person > might want cooperate on fixing a bug, in which case a 'feature' branch > is also called for. In order to keep things simple, I suggest we > always work on 'feature' branches, so we can avoid introducing more > rules that determine when to use one and when not to. KISS :-) > > Also: the Gitflow article mentions the 'develop' branch is actually > the 'integration' branch, which I also read as: don't work on it > directly. > > EdB > > > On Fri, Mar 22, 2013 at 11:10 AM, Justin Mclean > <jus...@classsoftware.com> wrote: >> >> Hi, >> >>> As the Gitflow model this project agreed to follow says to always (and >>> only) work on feature branches >> >> For features yes but not for bug fixes as far as I'm aware. Notice the >> yellow dots on the develop branch with no arrows from other branches. >> Bugfixes are not the same as hotfixes as hotfixes are applied to the release >> branch not the develop branch. >> >> http://nvie.com/posts/a-successful-git-branching-model/ >> >> Justin > > > > > -- > Ix Multimedia Software > > Jan Luykenstraat 27 > 3521 VB Utrecht > > T. 06-51952295 > I. www.ixsoftware.nl -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl
