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 ashoeafoot on Saturday December 07, 2024 @02:34PM (#42352218)
What i would love is, if the edit conflict was already baked into the language . Conflict<Implementation1, Implementation2>.
[ Parent | on HN ]
Re:Lies I was told about collab editing, Part 1: Algorithms ... by GTP on Saturday December 07, 2024 @06:02PM (#42353539)
What would be the advantage vs having an UI that clearly shows the conflict?
[ Parent | on HN ]
Re:Lies I was told about collab editing, Part 1: Algorithms ... by ashoeafoot on Sunday December 08, 2024 @04:58AM (#42356197)
It would allow for identification of intent and reasoning over that.

Is it aggregate, the people adding to the same with no overlaping elements.

Is it a overlapping set, n-people contributing the same

Is it a xor set where two people want to split up a implementation and go into different directions ?

If one deletes and creates a new as replacement , the other continues to work on the element, that could auto map to an intent above.

And if you know that you can provide much more resonable merges.

[ Parent | on HN ]