FlashcardIntermediate

What Causes a Merge Conflict

A merge conflict occurs when Git cannot automatically reconcile competing changes to the same lines.

Question

What causes a merge conflict in Git?

Click to reveal answer