I personally favor the master becomes == 1.2.x, since it allows us to be shippable and clean right away. We have put enough time before the other big branches with risk of amount of churn and ability to support such churn. This also levels the field so that all such big branches are put aside which doesn't favor specific set of changes over another. However, I'm willing to change my vote based on data provided by the team. Although we have been push off this hard decision for a while based on future promises.
My main priority is to get us out of this deadlock and set us into a path for being productive. I don't want the team to go through all checkins in master-2.x or master, or port to these branches. I want us to consider such branches as private branches to the devs that are working on them and it is their tax to get the goodness gradually into our new master.Whilst in the past I've been against using 1.2.x as a new master, as there's some stuff in 1.3 - I'm basically at the point I'd rather use 1.2.x and spend time porting stuff from 1.3/elsewhere.There are a couple of commits that went into a 1.2 release that I think should not have gone in - but I'd rather work on implementing those in a more acceptable way. I'd personally like to take 1.2.15 as a branch pointPaul