News for hackers. Stuff that matters.
Re:The Unison language by Dylan16807 on Friday January 10, 2020 @08:38PM (#22017426)
But git works the same way. All files are immutable. All directory trees are immutable. Basically all version control works that way at some level.

Storing data this way doesn't solve the problem of merging the two changes into a new single change. When you can't do that automatically, it's called a conflict.

The only mutable data in git is the list of hashes you've given names to. You can use git without branch names if you want, living in a world of pure immutable hashes. It doesn't do anything to help you get rid of merge conflicts.

There are no comments on this comment yet.