+1 just one question (which was not clear from the email), once RM merges into release branch, who merges into master ?
-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.
