Am 05.08.2014 um 20:36 schrieb Stefan Reinauer:
Are you suggesting that the needs have changed here?
My only concern here would be to keep rebase/merge et al more functional, but
it's probably already too late for that in the current state.
I suppose, once the trees are somewhat synchronized, one could build a merge commit
between both histories to create a new baseline - and redo that every now and then.