Flexible Definition and Resolution of Conflicts through Multi-level Editing
- 1 November 2006
- conference paper
- Published by Institute of Electrical and Electronics Engineers (IEEE)
- p. 1-10
Abstract
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 levelsKeywords
This publication has 17 references indexed in Scilit:
- Preserving operation effects relation in group editors2004
- X-Diff: an effective change detection algorithm for XML documents2004
- Using the transformational approach to build a safe and generic data synchronizer2003
- The consistency control system of XML documents2003
- SAMS: synchronous, asynchronous, multi-synchronous environments2003
- Sync: a Java framework for mobile collaborative applicationsComputer, 1997
- A flexible object merging framework1994
- Operation-based merging1992
- Concurrency control in groupware systems1989
- AnO(ND) difference algorithm and its variationsAlgorithmica, 1986