Merge conflict in version control

Question

What does it mean when there is a merge conflict in version control?

Answer

A merge conflict occurs when two branches have changes to the same line of a file or when one branch deletes a file that another branch has modified. This conflict must be resolved manually before the branches can be merged successfully.