+1 Something that may need to be adjusted...
If two different people are working on different hotfixes for 4.4, lets say they are for bugs CS-1234 and CS-5678, then in the current model they would both push their hotfix to 'hotfix/4.4.1'. This will cause branch naming collisions which could be hard to work around. I think we may want to adopt a hotfix branch name that reflects the bug the hotfix is related to. So for the above example, the hotfix branches could be named something like 'hotfix/4.4.1-cs-1234' and 'hotfix/4.4.1-cs-5678'. I don't think that two different committers work should go into the same 'hotfix/4.4.1' branch to be committed. I think that will cause way too many issues... ws *Will STEVENS* Lead Developer *CloudOps* *| *Cloud Solutions Experts 420 rue Guy *|* Montreal *|* Quebec *|* H3J 1S6 w cloudops.com *|* tw @CloudOps_ On Thu, Jul 31, 2014 at 11:03 AM, Mike Tutkowski < mike.tutkow...@solidfire.com> wrote: > +1 > > On Thursday, July 31, 2014, Hugo Trippaers <h...@trippaers.nl> wrote: > > > +1 on the proposal > > > > Cheers, > > > > Hugo > > > > > > On 31 jul. 2014, at 14:31, Stephen Turner <stephen.tur...@citrix.com > > <javascript:;>> wrote: > > > > > +1 from me. > > > > > > -- > > > Stephen Turner > > > > > > > > > -----Original Message----- > > > From: Rajani Karuturi [mailto:rajani.karut...@citrix.com > <javascript:;>] > > > Sent: 31 July 2014 11:28 > > > To: dev > > > Subject: [VOTE] git workflow > > > > > > Hi All, > > > > > > We had long discussions on the git flow. > > > I tried to capture the summary of it @ > > http://markmail.org/message/j5z7dxjcqxfkfhpj > > > This is updated on wiki @ > > > https://cwiki.apache.org/confluence/display/CLOUDSTACK/Git#Git-ProposedGitflowbasedCheck-inProcess > > and is up for a vote: > > > > > > Can you share your opinion on the proposal? > > > > > > [ ] +1 approve > > > [ ] +0 no opinion > > > [ ] -1 disapprove (and reason why) > > > > > > > > > Thanks, > > > ~Rajani > > > > > > > > > > > > > > > -- > *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>*™* >
