You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cloudstack.apache.org by Rohit Yadav <ro...@shapeblue.com> on 2020/02/07 05:54:07 UTC
4.13 force push apologies
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
rohit.yadav@shapeblue.com
www.shapeblue.com
3 London Bridge Street, 3rd floor, News Building, London SE1 9SGUK
@shapeblue
Re: 4.13 force push apologies
Posted by Gabriel Beims Bräscher <ga...@gmail.com>.
No problem Rohit, all looking good now.
Cheers,
Gabriel.
Em sex., 7 de fev. de 2020 às 13:43, Paul Angus <pa...@shapeblue.com>
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 <da...@gmail.com>
> Sent: 07 February 2020 08:01
> To: dev <de...@cloudstack.apache.org>
> Cc: private@cloudstack.apache.org
> 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.
>
>
> paul.angus@shapeblue.com
> 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 <rohit.yadav@shapeblue.com
> <ma...@shapeblue.com>> 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
>
> rohit.yadav@shapeblue.com<ma...@shapeblue.com>
> www.shapeblue.com<http://www.shapeblue.com>
> 3 London Bridge Street, 3rd floor, News Building, London SE1 9SGUK
> @shapeblue
>
>
>
>
> --
> Daan
>
RE: 4.13 force push apologies
Posted by Paul Angus <pa...@shapeblue.com>.
…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 <da...@gmail.com>
Sent: 07 February 2020 08:01
To: dev <de...@cloudstack.apache.org>
Cc: private@cloudstack.apache.org
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.
paul.angus@shapeblue.com
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 <ro...@shapeblue.com>> 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
rohit.yadav@shapeblue.com<ma...@shapeblue.com>
www.shapeblue.com<http://www.shapeblue.com>
3 London Bridge Street, 3rd floor, News Building, London SE1 9SGUK
@shapeblue
--
Daan
Re: 4.13 force push apologies
Posted by Daan Hoogland <da...@gmail.com>.
all good Rohit,
I just did a pull on both branches and no merge happened, so i think you
did the right thing.
On Fri, Feb 7, 2020 at 6:54 AM Rohit Yadav <ro...@shapeblue.com>
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
>
> rohit.yadav@shapeblue.com
> www.shapeblue.com
> 3 London Bridge Street, 3rd floor, News Building, London SE1 9SGUK
> @shapeblue
>
>
>
>
--
Daan
Re: 4.13 force push apologies
Posted by Rohit Yadav <ro...@shapeblue.com>.
Thanks Wei and Daan for checking.
Regards,
Rohit Yadav
Software Architect, ShapeBlue
https://www.shapeblue.com
________________________________
From: Wei ZHOU <us...@gmail.com>
Sent: Friday, February 7, 2020 14:19
To: dev@cloudstack.apache.org <de...@cloudstack.apache.org>
Subject: Re: 4.13 force push apologies
all are good for me .
no worries Rohit.
-Wei
rohit.yadav@shapeblue.com
www.shapeblue.com
3 London Bridge Street, 3rd floor, News Building, London SE1 9SGUK
@shapeblue
On Fri, 7 Feb 2020 at 06:54, Rohit Yadav <ro...@shapeblue.com> 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
>
> rohit.yadav@shapeblue.com
> www.shapeblue.com<http://www.shapeblue.com>
> 3 London Bridge Street, 3rd floor, News Building, London SE1 9SGUK
> @shapeblue
>
>
>
>
Re: 4.13 force push apologies
Posted by Wei ZHOU <us...@gmail.com>.
all are good for me .
no worries Rohit.
-Wei
On Fri, 7 Feb 2020 at 06:54, Rohit Yadav <ro...@shapeblue.com> 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
>
> rohit.yadav@shapeblue.com
> www.shapeblue.com
> 3 London Bridge Street, 3rd floor, News Building, London SE1 9SGUK
> @shapeblue
>
>
>
>