"How to fix a mess in git"

[swaldman]

Nice flowchart here.

It's not new, but I haven't seen it here before :-)