Merge Conflicts

What is a merge conflict?

Merge conflicts occur, most commonly, when more than one contributor is working on a project. A merge conflict takes place when a file changes at the same line in different branches ...