Noissue - Merge current tip to Edge bookmark

Noissue - Merge current tip to Edge bookmark

[Sebastian Noack, 2017-05-30 15:53:32]

I have no idea, how to possibly review this. I guess let's just go ahead merging
this, and I will review the remaining changes on top when we eventually merge
them upstream.

[kzar, 2017-05-30 16:33:01]

On 2017/05/30 15:53:32, Sebastian Noack wrote:
> I have no idea, how to possibly review this. I guess let's just go ahead
merging
> this, and I will review the remaining changes on top when we eventually merge
> them upstream.

Wouldn't it be better to rebase the Edge changes on top of the master branch
Ollie? Either way I agree about not being able to review this, it would actually
be easier to re-review all the changes in the edge branch after you're done
rebasing.

[Oleksandr, 2017-05-30 16:41:39]

On 2017/05/30 16:33:01, kzar wrote:
> On 2017/05/30 15:53:32, Sebastian Noack wrote:
> > I have no idea, how to possibly review this. I guess let's just go ahead
> merging
> > this, and I will review the remaining changes on top when we eventually
merge
> > them upstream.
> 
> Wouldn't it be better to rebase the Edge changes on top of the master branch
> Ollie? Either way I agree about not being able to review this, it would
actually
> be easier to re-review all the changes in the edge branch after you're done
> rebasing.

There is more Edge specific stuff coming after this. So I would still keep the
Edge bookmark for a bit. But yes, I think it is a good idea to just cherry pick
when we close the Edge branch. Closing this.

[kzar, 2017-05-30 16:52:17]

On 2017/05/30 16:41:39, Oleksandr wrote: 
> > Wouldn't it be better to rebase the Edge changes on top of the master branch
> > Ollie?
> There is more Edge specific stuff coming after this. So I would still keep the
> Edge bookmark for a bit.

Well rebasing the edge branch on top of master does not remove the edge branch.
It would just mean there wasn't a huge "merge master back in here" commit on top
of the Edge commits. (Sorry for using Git terms instead of Mercurial ones.)