A Buffet of Conflict Resolution Approaches

With great power comes great fun.

Git has drilled one idea into our heads: resolving conflicts means editing conflicted files. It feels so self-evident that no alternative ever crosses our mind.

Would you believe that a rebase conflict can be resolved by running another rebase? Or by editing a file that has no conflicts at all? Sounds ridiculous, right?

Here's a small collection of real-world cases and their possible resolutions.