One of the 100 questions in this topic
A merge conflict happens when Git cannot merge changes automatically.