Operation-based merging
- 1 November 1992
- journal article
- conference paper
- Published by Association for Computing Machinery (ACM) in ACM SIGSOFT Software Engineering Notes
- Vol. 17 (5) , 78-87
- https://doi.org/10.1145/142882.143753
Abstract
Existing approaches for merging the results of parallel development activities are limited. These approaches can be characterised as state-based: only the initial and final states are considered. This paper introduces operation-based merging, which uses the operations that were performed during development. In many cases operation-based merging has advantages over state-based merging, because it automatically respects the data-type invariants of the objects, is extensible for arbitrary object types, provides better conflict detection and allows for better support for solving these conflicts. Several algorithms for conflict detection are described and compared.Keywords
This publication has 5 references indexed in Scilit:
- Structure-oriented merging of revisions of software documentsPublished by Association for Computing Machinery (ACM) ,1991
- Integrating noninterfering versions of programsACM Transactions on Programming Languages and Systems, 1989
- Integrating non-intering versions of programsPublished by Association for Computing Machinery (ACM) ,1988
- Rcs — a system for version controlSoftware: Practice and Experience, 1985
- Computer-Aided Software Engineering in a distributed workstation environmentPublished by Association for Computing Machinery (ACM) ,1984