Re: yocto 1.7 final rebase

[Colin Walters <walters verbum org>]

On Thu, Nov 6, 2014, at 12:30 PM, Alexander Larsson wrote:

> How do we merge this? Do we use a new branch, or do we force replace the
> old one? I didn't want to git merge the changes because then it would be
> harder to eventually rebase our changes on the next yocto release.

Prefer new branch.  And reapplying changes on top.  That's the way I've
been doing it so far.  It is painful.

Where we need to get to is where Continuous is an OE layer instead of a fork.
Depends on https://bugzilla.yoctoproject.org/show_bug.cgi?id=6259 at least.