2 ms·
That's like saying Git has no conflicts because a file can have different contents in different commits. A conflict can only arise when trying to unify (aka me
by the_duke 7y ago
That's like saying Git has no conflicts because a file can have different contents in different commits.
A conflict can only arise when trying to unify (aka merge) two different states. The difference is the representation, with Git (naively explained) mapping file paths to text blobs , and Unison mapping identifiers to AST nodes.