Jonathan,

I actually started to merge stable into the diverged branch (Keep stable stable, but introduce the fixes into the experimental branch).  As Toby said: It was quickly determined to be a disaster.  Also, many of the changes are incomplete, no longer relevant, or of low quality.  Seems that cherry-picking is good.  I now have my GUI changes in an update-to-date branch.  I'm going to push it later today for Ivan Paponov and me to implement some Cusis stuff for fun.

-- Paul


On Wed, Dec 19, 2012 at 12:35 PM, Tobias Doerffel <tobias.doerffel@gmail.com> wrote:
Hi,

2012/12/19 Jonathan Aquilina <eagles051387@gmail.com>:
> Why not merge the diverged branch back into stable?

Because it has diverged way too much and also many classes and files
were renamed in the master branch. You would end up resolving
conflicts for days, if not weeks..


Toby