@b0rk
I usually end up inspecting history with a GUI. (I like gitup.co for these sorts of task.)
This is a situation where GitHub fails extra hard, imo. It seems to me other version control systems somehow aren’t as confusing about how they show the conflict.