On Aug 19, 2014, at 5:23 AM, Rohit Yadav <rohit.ya...@shapeblue.com> wrote:
> > On 19-Aug-2014, at 10:58 am, Sebastien Goasguen <run...@gmail.com> wrote: > >> +1 >> >> just one question (which was not clear from the email), once RM merges into >> release branch, who merges into master ? > > Merging on master can be done by the RM or any of the committers (can be even > more than once a day), the only challenge will be that they may end up fixing > some (smaller conflicts if we do it couple of times a day) conflicts on > master. > > It would makes sense that its either the RM or the contributor who fixed the > issue for the release branch as they are the stakeholders who would > understand it better and may want to get their stuff on master. For example > if contributor A sends out a hotfix for release Z, then after their hotfix is > merged onto Z, contributor A themselves can merge Z branch to master. ok makes sense to me. One more detail -mostly for reference in the thread-: Say you grab a patch from review board and stick it in a hotfix branch, test that …call for merge on release branch. Do we *merge* to master or can we apply the patch directly to master (git am -s…) ? > > Cheers. > >> >> -sebastien >> >> On Aug 19, 2014, at 4:18 AM, Rohit Yadav <rohit.ya...@shapeblue.com> wrote: >> >>> >>> On 19-Aug-2014, at 1:54 am, Min Chen <min.c...@citrix.com> wrote: >>> >>>> [Min] I don't quite understand why you are saying that it won't cause >>>> conflicts when we do 4.2 fast-forward to 4.3 branch. What if the codebase >>>> in 4.3 has been changed a lot? >>> >>> That was an example, yes conflicts can happen but they will be minimal and >>> will happen around since the tag/SHA. >>> I also said, in places where it’s not possible one can use cherry-picking >>> or manually fixing the bug. >>> >>> 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. >> > > 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.
