Re: One good thing about git is the tools for fixing mess-ups
I usually end up having to merge because I made a change without remembering to update my local copy (because I am an idiot).
So far I've never managed to successfully merge a commit, so instead I just make a copy and then
git reset --hard. I assume that this is the intended workflow, so this is my life now.