08:01
> To: dev
> Cc: priv...@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.an...@shapeblue.com
> www.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
Sent: 07 February 2020 08:01
To: dev
Cc: priv...@cloudstack.apache.org
Subject: Re: 4.13 force push apologies
all good Rohit,
I just did a pull on both branches and
Thanks Wei and Daan for checking.
Regards,
Rohit Yadav
Software Architect, ShapeBlue
https://www.shapeblue.com
From: Wei ZHOU
Sent: Friday, February 7, 2020 14:19
To: dev@cloudstack.apache.org
Subject: Re: 4.13 force push apologies
all are good for me .
no
all are good for me .
no worries Rohit.
-Wei
On Fri, 7 Feb 2020 at 06:54, Rohit Yadav 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 happene
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
wrote:
> All,
>
> I made a forward merge error and accidentally merged master into 4.13,
> rather than the opposite (while using Github, should
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/d88c614a35107015f211c598282
