News for hackers. Stuff that matters.

A comment on The Unison language. Parent comment

Re:The Unison language by aidenn0 on Friday January 10, 2020 @12:04PM (#22012452)
So I append X to my file and you append Y to your file, do we not have a conflict?
[ Parent | on HN ]
Re:The Unison language by capableweb on Friday January 10, 2020 @01:13PM (#22013262)
Yes and no. Yes as in, if you'd like them to be merged into a new one, then you'll have to resolve a conflict. But no as in, you both appended different data, so you both have new files from the original one, as you're dealing with immutable data.
[ Parent | on HN ]
Re:The Unison language by strbean on Friday January 10, 2020 @04:35PM (#22015815)
If you want to resolve merges using the workflow of git, you can generate scratch files and diff them, right?
[ Parent | on HN ]