Thread
#dev
    Ariel Shaqed (Scolnicov)

    Ariel Shaqed (Scolnicov)

    4 weeks ago
    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.)
    ("Tough" in the sense of "I'm not there yet"...)