论文信息 - A View of A Merge

A View of A Merge

This paper describes work on providing support for teams of software engineers in software development environments. Particularly integrated support for merging. The paper gives an brief overview of the project, and an introduction to the revision control approach. The focus is on presentation of conflicts in the merge situation and user interaction to resolve these conflicts.

Torsten Olsson

[1] Boris Magnusson,et al. A Model for Semi-(a)Synchronous Collaborative Editing , 1993, ECSCW.

[2] Jörg M. Haake,et al. Supporting collaborative writing of hyperdocuments in SEPIA , 1992, CSCW '92.

[3] Boris Magnusson,et al. Fine-grained revision control for collaborative software development , 1993, SIGSOFT '93.

[4] David Kaufer,et al. Flexible Diff-ing in a collaborative writing system , 1992, CSCW '92.

[5] J. Lindskov Knudsen. Object-oriented environments : the Mjølner approach , 1993 .

[6] David Kaufer,et al. Issues in the design of computer support for co-authoring and commenting , 1990, CSCW '90.

[7] Boris Magnusson,et al. Fine Grained Version Control of Configurations in COOP/Orm , 1996, SCM.

[8] Boris Magnusson,et al. The Mjølner Environment: Direct Interaction with Abstractions , 1988, ECOOP.

[9] Simon M. Kaplan,et al. Flexible, active support for collaborative work with ConversationBuilder , 1992, CSCW '92.