Slides / VideoIntermediate
What a Merge Conflict Is
A merge conflict happens when Git can't automatically combine two branches that changed the same lines.
1 / 6
A merge conflict happens when Git can't automatically combine two branches that changed the same lines.