Git & CollaborationBeginner
Merge Conflict
PronunciationMERJ KON-flikt
Definition
When Git cannot combine two changes automatically because both edited the same lines, so a person must choose.
Where you hear it
Any team project.
Examples
I have a merge conflict in
package.json.Resolve the conflict, then commit the result.
Common mistake
Choosing "accept all mine" without reading. You may delete a teammate's work.
Keep exploring
More in Git & Collaboration