Overview
Branches are valuable only if their useful work can be integrated. Merging provides that integration, while conflict resolution ensures that Git does not make a silent decision when human intent is required.
A conflict is therefore not simply a failure. It is a protection mechanism. Git recognizes that two valid histories disagree at the same location and requires an explicit decision.
This preserves control over the final code instead of arbitrarily discarding one contributor's work.