git-flow with master always golden would be a good method. Right now the development model just isn't working.
fwiw, I am not a developer, just a tinkerer with git and some bash and a lurker :) On Thu, Jul 24, 2014 at 10:47 AM, Mike Tutkowski < mike.tutkow...@solidfire.com> wrote: > Yep...what Wei said. :) > > > On Thu, Jul 24, 2014 at 8:20 AM, Wei ZHOU <ustcweiz...@gmail.com> wrote: > > > yes. I think 4.4-forward can be merged into 4.4 branch after 4.4.0 > release, > > then delete it. > > > > > > 2014-07-24 15:08 GMT+02:00 Daan Hoogland <daan.hoogl...@gmail.com>: > > > > > As we will probably need a 4.4.1 I will spend some tine cherry picking > > > through 4.4-forward to get any changes we will need from there (plus > > > test cases) > > > > > > I will remove 4.4-forward after I am done. > > > > > > As per the git flow way of working any fixes on 4.4 will be done on a > > > per fix branch of off 4.4. > > > > > > please speak up if you have objections! > > > > > > -- > > > Daan > > > > > > > > > -- > *Mike Tutkowski* > *Senior CloudStack Developer, SolidFire Inc.* > e: mike.tutkow...@solidfire.com > o: 303.746.7302 > Advancing the way the world uses the cloud > <http://solidfire.com/solution/overview/?video=play>*™* >
