2nd International ICST Conference on Collaborative Computing: Networking, Applications and Worksharing

Research Article

Flexible Definition and Resolution of Conflicts through Multi-level Editing

  • @INPROCEEDINGS{10.1109/COLCOM.2006.361869,
        author={Claudia-Lavinia Ignat and Moira C. Norrie},
        title={Flexible Definition and Resolution of Conflicts through Multi-level Editing},
        proceedings={2nd International ICST Conference on Collaborative Computing: Networking, Applications and Worksharing},
        publisher={IEEE},
        proceedings_a={COLLABORATECOM},
        year={2007},
        month={5},
        keywords={},
        doi={10.1109/COLCOM.2006.361869}
    }
    
  • Claudia-Lavinia Ignat
    Moira C. Norrie
    Year: 2007
    Flexible Definition and Resolution of Conflicts through Multi-level Editing
    COLLABORATECOM
    IEEE
    DOI: 10.1109/COLCOM.2006.361869
Claudia-Lavinia Ignat1,*, Moira C. Norrie1,*
  • 1: Institute for Information Systems, ETH Zurich, CH-8092, Zurich, Switzerland
*Contact email: ignat@inf.ethz.ch, norrie@inf.ethz.ch

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 levels.