3 ms·
That seems to be incorrect. The linked page seems to suggest that both changes will exist without any conflict at the VCS level at all.
by pwinnski 7y ago
That seems to be incorrect. The linked page seems to suggest that both changes will exist without any conflict at the VCS level at all.
- colonwqbang 7y agoThen how do you know which main function to use? That information has to be stored somewhere. Or does the user provide the hash for the main function they wish to run?
- the_duke 7y agoThat'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.