Flexible Definition and Resolution of Conflicts through Multi-level Editing

Version control systems are widely used to support a group of people working together on a set of documents over a network by merging their changes into the same source repository. The existing versioning systems offer limited support concerning conflict resolution and tracking of user activity. In this paper we propose a multi-level editing approach that keeps the editing operations that refer to an element of a hierarchical document associated with that element. In this way, customisable merging is achieved, where the conflicts can be specified and resolved at different granularity levels