On Sat, Aug 7, 2010 at 5:13 PM, Brett Morgan <[email protected]> wrote:
> Patrick, > > OT and version control systems serve very different masters. By that I mean > you wouldn't want to use the merge system of version control systems for > Wave, just as you would not want to use OT for managing source code history. > > The reason is simple, to steal a line from one of the Wave team, OT is too > good. OT's merge never fails. > > In version control systems you, as a user, rely on the merge failing to > highlight areas that need human intervention. In wave we don't want humans > to have to constantly be involved in handling the real time merge of the > disparate change streams. > > brett > This is one of the fantastic use cases of having different OT semantics for different types of data. - For code editing, I want the current wave OT algorithm - For code merging (ie, merge my changes with yours) I want edits on close regions of the document to create conflict markers. (I think) it should be a reasonably easy change. -J -- You received this message because you are subscribed to the Google Groups "Wave Protocol" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/wave-protocol?hl=en.
