Will
Esteban Küber 
Every time I'm halfway through a nasty rebase, I can hear the project's voice in my head: "I've altered the upstream, pray I do not alter it any further."
Tommi Komulainen@ekuber git imerge seemed nice, only used it once though
https://github.com/mhagger/git-imerge
David Laban@ekuber
"It's a trap! --abort" (and --keep-base -i to regroup into a single commit?)
"Use the --force Luke" (I couldn't resist)
"I find your lack of trunk based development disturbing" (-- Nicole Forsgren, Accelerate)
... that all I've got.