Challenge 2: "The GUI Means I Don't Need to Understand Merge Conflicts" — Solution Walkthrough

Why this belief is mistaken:

Per this chapter's own tip box, what a merge conflict actually
represents — two changes to the same part of a file that Git can't
automatically reconcile — is unchanged regardless of which interface
is used to resolve it. The three-pane merge tool this chapter
describes still requires understanding which version (yours, theirs,
or some combination) should actually be kept for each specific
conflict — a decision the tool presents visually, but doesn't make for
you, and can't make correctly without understanding what each side's
changes actually represent.

What the GUI actually provides here:

The visual merge tool makes the mechanics of resolving a conflict more
convenient — seeing both versions side by side and clicking to choose,
rather than manually editing raw conflict markers in a plain text
editor. It does not remove the need to understand the underlying
concept of what a conflict is or reason about which changes should
survive; it only changes how that decision gets carried out.

The risk in this developer's belief:

Without understanding what a conflict actually represents, this
developer risks resolving a conflict incorrectly — picking the wrong
side, or manually combining code in a way that doesn't actually make
sense — simply because a visual tool made the process feel simpler
than it conceptually is.

WHY THIS WORKS AS AN ANSWER
------------------------------
This exercise directly applies this chapter's own tip box —
conceptual Git knowledge transfers unchanged regardless of interface —
to a concrete misconception about merge conflicts specifically,
correctly separating "the GUI makes the mechanics easier" from "the
GUI removes the need to understand the concept."