Operation-based merging

Proceedings of the 5th ACM SIGSOFT Symposium on Software Development Environments, SDE 1992

Volumn , Issue , 1992, Pages 78-87

  Lippe, Ernst ^a   Van Oosterom, Norbert ^a  

^a UTRECHT UNIVERSITY   (Netherlands)

Author keywords

[No Author keywords available]

Indexed keywords

SOFTWARE DESIGN;

ARBITRARY OBJECTS; CONFLICT DETECTION; DATA TYPE; FINAL STATE; PARALLEL DEVELOPMENT; STATE BASED;

MERGING;

EID: 85018106387     PISSN: None     EISSN: None     Source Type: Conference Proceeding    
DOI: 10.1145/142868.143753     Document Type: Conference Paper

References (14)

1. [AGMT86] Evan Adams, Wayne Gramlich, Steven S. Muchnick, and Soren Tirfing. Sun Pro: Engineering a practical program development environment. In Reidar Conradi, Tor M. Didriksen, and Dag H. Wanvik, editors, Advanced Programming Environments, pages 86-96. Springer Verlag, June 1986. Proceedings of an International Workshop. Trondheim, Norway.
2. [CFH88] William Courington, Jonathan Feiber, and Mashiro Honda. NSE highlights, NSE tackles large-scale programming issues. Sun Technology, pages 49-53, Winter 1988.
3. [CLR91] Thomas H. Cormen, Charles E. Leiserson, and Ronald L Rivest. Introduction to Algorithms. MIT Press, 1991.
4. [ECM90] ECMA. Portable common tool environment (pete) abstract specification, December 1990. Standard ECMA-149.
5. [FLD+92] Gert Florijn, Ernst Lippe, Atze Dijkstra, Norbert van Oosterom, and Doaitse Swierstra. Camera: Cooperation in open distributed environments. In Eur Open and USENIX Spring 1992 Workshop; Jersey, Channel Islands, April 1992.
6. [HPR88] Susan Horwitz, Jan Prins, and Thomas Reps. Integrating non-interfering versions of programs. In Proceedings of the SIGPLAN 88 Symposium on the Principles of Programming Languages, 1988.
7. [HPR89] Susan Horwitz, Jan Prins, and Thomas Reps. Integrating non-interfering versions of programs. ACM Transactions on Programming Languages and Systems, 2 (3):345-387, July 1989.
8. [LC84] D.B. Leblang and Robert P. Chase Jr. Computer-aided software engineering in a dis-tributed workstation environment. In P. Henderson, editor, Sigplan/Sigsoft Software Engineering Symposium on Practical Software Development Environments, pages 104-112. ACM, May 1984. In Sigplan Notices.
9. [Lip92] Ernst Lippe. CAMERA: Supporting Distributed Cooperative Work. PhD thesis, University of Utrecht, 1992.
10. [PAC89] PACT. Configuration Management Guide, December 1989.
11. [SK90] Christopher R. Sheedy and Stephanie L. Kinoshita. Version management tool. Tandem corporation; US patent nr 4, 912, 637, March 1990.
12. [Tic85] Walter F. Tichy. RCS - A system for version control. Software Practice and Experience, 15(7):637-654, July 1985.
13. [Wal88] Larry Wall. Patch - A program to apply diffs to original files, 1988.
14. [Wes91] Bernhard Westfechtel. Structure-oriented merging of revisions of software documents. In Peter H. Feiler, editor, Proceedings of the 3rd International Workshop on Software Configuration Management, pages 68-79, 1991.