Abstract. Version control systems allow a group of people to work together on a set of documents over a network by merging their changes into the same source repository. The existing version control systems offer limited support concerning conflict resolution and tracking of user activity. In this paper we propose a customisable operational transformation merging approach for hierarchical documents that offers the possibility to specify and resolve the conflicts at different granularity levels. Our proposed approach also achieves better efficiency compared to existing approaches for merging documents with linear structures.
Claudia-Lavinia Ignat, Moira C. Norrie