And I understand about the merge. I'm the same, although with the recent changes I found it easier to merge it as is, then do commit by commit updates to fix it back up.
I suppose that's what happens when there's effectively two branches doing different refactoring on each. :-)
But maybe there's a Git feature I don't know about yet that would help this scenario.
Yeah that's fine, I completely understand.