Overview
Merging can combine independent work automatically, but overlapping edits require manual judgment.
The developer resolving a conflict must understand the intended behavior. Git can show the competing text, but it cannot determine the correct business or technical decision.
Merging in the wrong direction updates the wrong branch. Always confirm the current branch before running git merge.
A conflict resolution is not complete when the file is merely edited. The resolved file must be staged and committed.