#030 What is a conflict?

A conflict happens if one or more changes are made to the same line in a file and git doesn't know which change to apply

Command Description
conflict It happens when two or more changes are made to the same chunk of a file and git doesn’t know how to apply the most recent change
>>>, ===, and <<< Conflicts markers