Ariel Shaqed (Scolnicov)

Ariel Shaqed (Scolnicov)

08/31/2022, 7:16 AM
Interesting but tough reading: Conflict resolution for structured merge via version space algebra. Adds some algebraic representations of merging. (AFAICT this is not the operational transform approach behind Google Docs, rather something like a description of Git's 3-way merge (which is also our model.)
7:17 AM
("Tough" in the sense of "I'm not there yet"...)