No problem Rohit, all looking good now. Cheers, Gabriel.
Em sex., 7 de fev. de 2020 às 13:43, Paul Angus <[email protected]> escreveu: > …this makes me feel better about all the times I’ve not done what I > thought I was doing… no problem Rohit! > > From: Daan Hoogland <[email protected]> > Sent: 07 February 2020 08:01 > To: dev <[email protected]> > Cc: [email protected] > Subject: Re: 4.13 force push apologies > > all good Rohit, > I just did a pull on both branches and no merge happened, so i think you > did the right thing. > > > [email protected] > www.shapeblue.com > 3 London Bridge Street, 3rd floor, News Building, London SE1 9SGUK > @shapeblue > > > > On Fri, Feb 7, 2020 at 6:54 AM Rohit Yadav <[email protected] > <mailto:[email protected]>> wrote: > All, > > I made a forward merge error and accidentally merged master into 4.13, > rather than the opposite (while using Github, should have stick to using > zsh to do forward merges). > > This happened after this commit on 4.13 branch: > > https://github.com/apache/cloudstack/commit/d88c614a35107015f211c598282c03f0408f32d2 > > For reference, I've applied the course correction by resetting --hard the > known good commit on 4.13, cherry-pick the PRs merged onto 4.13 and force > push on remote 4.13 branch, and then forward merged the same onto > origin/master. I further checked the commit SHAs to ensure branch > integrities of both 4.13 and master, I'll be watching both 4.13 and master > smoketests+Travis. > > Please accept my apologies for the force push and I hope to have your > support. Thanks. > > > Regards, > > Rohit Yadav > > Software Architect, ShapeBlue > > https://www.shapeblue.com > > [email protected]<mailto:[email protected]> > www.shapeblue.com<http://www.shapeblue.com> > 3 London Bridge Street, 3rd floor, News Building, London SE1 9SGUK > @shapeblue > > > > > -- > Daan >
