News for hackers. Stuff that matters.

A comment on The Unison language. Parent comment

Re:The Unison language by pwinnski on Friday January 10, 2020 @10:04AM (#22011397)
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.
[ Parent | on HN ]
Re:The Unison language by the_duke on Friday January 10, 2020 @12:04PM (#22012451)
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.

[ Parent | on HN ]
Re:The Unison language by colonwqbang on Friday January 10, 2020 @10:32AM (#22011637)
Then 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?
[ Parent | on HN ]