ACM SIGSOFT Software Engineering Notes · 1992 · 48 citations · 5 references
ComputingComputer ScienceConflict ResolutionParallel AlgorithmsParallel ComputingClash DetectionData-flow AnalysisConflict DetectionInvariantsMergeMerge Conflict DetectionMerge OperationsMergingMerging Algorithms
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.
5
Rcs — a system for version control
Walter F. Tichy · Software Practice and Experience · 1985 · 950 citations
Integrating non-intering versions of programs
Susan Horwitz, Jan F. Prins, Thomas Reps · 1988 · 190 citations · Full text
Structure-oriented merging of revisions of software documents
Bernhard Westfechtel · 1991 · 112 citations · Full text