Ben Hyde on Conflict resolution, Background, Federation and Access Rights

Ben Hyde wrote in his blog about the use of conflict resolution techniques, familiar from source control, in wave.

He indicates that, instead of the conflict resolution algorithm making an average of 2 values, entered at the same spot, that it picks one. I could imagine a wave gadget that gives certain users a "master" right to a document, where their own edits can never be editted by other users, unless they specifically request access for it. Ok, not really a leap forward for collaboration, but might come in handy in, for example a student-teacher collaboration relation, or another situation where you want a tighter grip on control.

He also goes into detail about the historical background of concurrent editing, how different wave servers can be federated, and how access rights will be managed.

He states that it's totally unclear at this point how access rights are managed in the deeper structures, constructed in a wavelet.