Merge conflict
A merge conflict happens when two branches changed the same lines and Git cannot decide which to keep.
Definition
A merge conflict happens when two branches changed the same lines and Git cannot decide which to keep.
Use case
You pick the right version by hand. Small, frequent branches keep conflicts rare.
Related terms
Resources
No resources yet. Suggest one.