News for hackers. Stuff that matters.

A comment on Lies I was told about collab editing, Part 1: Algorithms for offline editing. Parent comment

Re:Lies I was told about collab editing, Part 1: Algorithms ... by satvikpendem on Friday December 06, 2024 @04:15PM (#42344529)
I mentioned Loro in another comment, but they actually do conflict resolution on top of Git trees [0]. Jujutsu is also interesting but I'm not sure if they do any conflict resolution [1].

[0] https://loro.dev/blog/v1.0#loro-version-controller

[1] https://github.com/martinvonz/jj

[ Parent | on HN ]

There are no comments on this comment yet.