> In Pijul, there are two kinds of conflicts inside a file: > When two different authors add lines at the same position in a file, and it is impossible to tel

> In Pijul, there are two kinds of conflicts inside a file: > When two different authors add lines at the same position in a file, and it is impossible to tell which comes first in the file. > When one author adds a line in a block of text or code, while another author deletes that block. I don't think this is true. Two different authors can modify the same line in different ways, which is a conflict that's different than either of these categories. > It is important to note that conflicts in Pijul always happen between changes, for example we might say that “change A conflicts with change B”. I also don't think this is true. Conflicts can occur in a history (lineage, sequence, etc.) of concurrent changes, which are different than the delta between any two independent changes.