SmartGitStill staring at merge conflicts like “Wait… did they add this or did I delete it?” 😵💫
Daniel Siegl just explained it perfectly with the glass-of-water analogy💧: One person pours water in. Another drinks some out.
Look at the two final glasses? Impossible to tell what happened.
But show the original glass? Suddenly everything is crystal clear. That’s exactly why 3-way merges beat 2-way diffs every single time.
Who else has wasted hours on confusing merges?👇