Write one sentence per file line

[mitar]

From my experience, working with git and LaTex is much easier if every sentence starts on new file line. You can wrap lines inside a sentence, this is still OK.

But do not have paragraphs per line and just use editor soft line wrapping. Then merging is much more complicated (more conflicts).