Glossary term
What is merge conflict? Meaning for developers
Two changes touch the same lines, so Git asks you to choose the result.
Learn it properly · Git & GitHubLesson 2: Branches, Merging and ConflictsFast-forward versus merge commits, and a real merge conflict resolved step by step.