What is a conflict

What is a

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
conflicts are indicated by the markers >>> === <<<

#030

@jtemporal