title: What exact rules does git / diff exactly follow to determine conflcts?
body: <p>How <strong>exactly</strong> does <code>git</code> determine that there is a conflict between lines? What rules are followed to determine what types of differences constitute a conflict and which ones can be safely merged? </p>
  
  <p>For a particular example, say we have two <code>csv</code> files. When would git conclude that two <code>csv</code> files that share records (i.e. rows) cannot be merged automatically?</p>
  
  <p>For example, say both csv include the same common set of records, but one of them is <strong>adding</strong> entries, could this ever cause a conflict?</p>