Next best thing is keeping conflicts unresolved, but marked as such as a first-class citizen of the document content (see pijul, jj).
Next best thing is keeping conflicts unresolved, but marked as such as a first-class citizen of the document content (see pijul, jj).