Hi Daan, On 08-Aug-2014, at 12:05 pm, Daan Hoogland <daan.hoogl...@gmail.com> wrote:
> Rohit, > > A remark and a question: > I would say merge and if not applicable cherry-pick. (to be sure that > the optimal solution is used) +1 > Why insist on fast-forward? (In the git-flow document it is emphasised > that --no-ff should be used at all times) So, in my proposal I ask developers to merge release (or stable) branches to master (or develop/feature branch) often (say couple of times in the day), using --no-ff will generate a merge commit every time we do that. With fast-forward we’ll get linear history so that’s why I keep insisting on it. IMO We should only use --no-ff only when we want to have git to track the merge history (i.e. for someone to go and see what feature/branch got merged and what work was done in that merge branch). Cheers. > > thanks, and thanks for seeing the first step to freedom so clearly, > Daan > > On Fri, Aug 8, 2014 at 11:59 AM, Rohit Yadav <rohit.ya...@shapeblue.com> > wrote: >> Another note on this blog/workflow/idea: >> >> Say I’ve a bug for multiple ACS releases, the way our workflow should be to >> fix it on the earliest ACS release branch we want to support and then to the >> next ones, finally on master and then feature/personal branches. Example, >> you fix on 4.1, then cherry-pick/fix to 4.2, then 4.3, 4.4 and finally >> master. One can use cherry-picking or merge with fast-forward whatever is >> applicable. >> >> Cheers. >> >> On 08-Aug-2014, at 10:25 am, Daan Hoogland <daan.hoogl...@gmail.com> wrote: >> >>> And another thank you: >>> >>> <quote> >>> Long-running release branches for long-term support >>> >>> What are the main long-running branches in this model? >>> >>> We have a master branch – which in Subversion (SVN) terms you would >>> call trunk – that is stable-ish. It is in a alpha/RC state. >>> We have stable release branches for each product release we have to >>> ship updates to. >>> >>> Commits always are merged upwards from older to newer branches. If a >>> fix needs to be applied to stable branch 2.2 for example, a bug fix >>> branch is created off the stable branch. First it gets merged back to >>> that branch, and then that branch is merged upwards towards master. >>> These chains of merges can be several branches long, but this >>> operation is almost completely automated. >>> </quote> >>> >>> I think this most resembles what we want (source: the link about >>> atlassian stash from >>> http://blogs.atlassian.com/2013/11/the-essence-of-branch-based-workflows/) >>> >>> Daan >>> >>> On Fri, Aug 8, 2014 at 9:46 AM, Daan Hoogland <daan.hoogl...@gmail.com> >>> wrote: >>>> thanks Rohit, >>>> >>>> I had missed this one. It contains obligatory release management >>>> knowledge for every keyboard toucher that is allowed to use git: >>>> https://www.kernel.org/pub/software/scm/git/docs/gitworkflows.html >>>> >>>> I think if we all read this and then study a bit we don't need to >>>> discuss or branching model. It will become clear that we are in fact >>>> doing almost fine and need only small changes. >>>> >>>> -- >>>> Daan >>> >>> >>> >>> -- >>> Daan >> >> Regards, >> Rohit Yadav >> Software Architect, ShapeBlue >> M. +41 779015219 | rohit.ya...@shapeblue.com >> Blog: bhaisaab.org | Twitter: @_bhaisaab >> >> >> >> Find out more about ShapeBlue and our range of CloudStack related services >> >> IaaS Cloud Design & Build<http://shapeblue.com/iaas-cloud-design-and-build//> >> CSForge – rapid IaaS deployment framework<http://shapeblue.com/csforge/> >> CloudStack Consulting<http://shapeblue.com/cloudstack-consultancy/> >> CloudStack Infrastructure >> Support<http://shapeblue.com/cloudstack-infrastructure-support/> >> CloudStack Bootcamp Training >> Courses<http://shapeblue.com/cloudstack-training/> >> >> This email and any attachments to it may be confidential and are intended >> solely for the use of the individual to whom it is addressed. Any views or >> opinions expressed are solely those of the author and do not necessarily >> represent those of Shape Blue Ltd or related companies. If you are not the >> intended recipient of this email, you must neither take any action based >> upon its contents, nor copy or show it to anyone. Please contact the sender >> if you believe you have received this email in error. Shape Blue Ltd is a >> company incorporated in England & Wales. ShapeBlue Services India LLP is a >> company incorporated in India and is operated under license from Shape Blue >> Ltd. Shape Blue Brasil Consultoria Ltda is a company incorporated in Brasil >> and is operated under license from Shape Blue Ltd. ShapeBlue SA Pty Ltd is a >> company registered by The Republic of South Africa and is traded under >> license from Shape Blue Ltd. ShapeBlue is a registered trademark. > > > > -- > Daan Regards, Rohit Yadav Software Architect, ShapeBlue M. +41 779015219 | rohit.ya...@shapeblue.com Blog: bhaisaab.org | Twitter: @_bhaisaab Find out more about ShapeBlue and our range of CloudStack related services IaaS Cloud Design & Build<http://shapeblue.com/iaas-cloud-design-and-build//> CSForge – rapid IaaS deployment framework<http://shapeblue.com/csforge/> CloudStack Consulting<http://shapeblue.com/cloudstack-consultancy/> CloudStack Infrastructure Support<http://shapeblue.com/cloudstack-infrastructure-support/> CloudStack Bootcamp Training Courses<http://shapeblue.com/cloudstack-training/> This email and any attachments to it may be confidential and are intended solely for the use of the individual to whom it is addressed. Any views or opinions expressed are solely those of the author and do not necessarily represent those of Shape Blue Ltd or related companies. If you are not the intended recipient of this email, you must neither take any action based upon its contents, nor copy or show it to anyone. Please contact the sender if you believe you have received this email in error. Shape Blue Ltd is a company incorporated in England & Wales. ShapeBlue Services India LLP is a company incorporated in India and is operated under license from Shape Blue Ltd. Shape Blue Brasil Consultoria Ltda is a company incorporated in Brasil and is operated under license from Shape Blue Ltd. ShapeBlue SA Pty Ltd is a company registered by The Republic of South Africa and is traded under license from Shape Blue Ltd. ShapeBlue is a registered trademark.
