ManagementChange ManagementConflict ResolutionDocument ControlDocument ManagementSoftware EvolutionSoftware MaintenanceVersion ControlVersion Control SystemsConflict DetectionDocument SynchronizationMergeMerge Conflict DetectionMerge StrategiesMerging AlgorithmsRevision GraphsVersion Control In Design
Abstract. This paper presents a model for controlling the evolution of documents concurrently developed by teams of authors. Optimistic check-out of revisions and alternatives, and hierarchic merge making use of default rules is presented. In particular the different situations occurring during a merge of parallel development lines and the benefit of storing the full evolution history is discussed. 1
7
Groupware: some issues and experiences
Clarence A. Ellis, Simon Gibbs, Gail L. Rein · Communications of the ACM · 1991 · 2.8K citations · Full text
Rcs — a system for version control
Walter F. Tichy · Software Practice and Experience · 1985 · 950 citations
The source code control system
Marc Rochkind · IEEE Transactions on Software Engineering · 1975 · 711 citations
Ernst Lippe, Norbert van Oosterom · 1992 · 169 citations