Google Drive Blog: What’s different about the new Google Docs: Conflict resolution

Google Drive Blog

The latest news and updates from the Google Drive team.

What’s different about the new Google Docs: Conflict resolution

Wednesday, September 22, 2010

Editor’s note: This is the second in a series of three posts about the collaboration technology in Google Docs. Yesterday, we explained some of the technical challenges behind real time collaboration.
EASY AS 123EASY AS ABC

IT'S EASY AS 123IT

{DeleteText @9-11}

transformIT

Style ranges expand when they are transformed against text insertions: {ApplyStyle bold @10-20} transformed against {InsertText 'ABC' @15} results in {ApplyStyle Bold @10-23}.

Sometimes changes don’t conflict and there’s no need to transform anything. For example when a style change is transformed against a different type of style change, there is no conflict: {ApplyStyle italic @10-20} transformed against {ApplyStyle font-color=red @0-30} results in the same {ApplyStyle italic @10-20} because the range of text can be both red and italic simultaneously.