Abstract
In this paper we discuss a powerful way to support merge of concurrently developed documents (such as programs). Existing merge tools require the user to decide for each individual change if it should be included or not. We show how it is possible to let the user to decide to include (or exclude) several changes in one go. In our prototype we use the structure of the document in order to support the user in making consistent merge decisions.
| Original language | English |
|---|---|
| Title of host publication | Proceedings of SCM-10, 10th International Workshop on Software Configuration Management: New Practices, New Challanges and New Boundaries |
| Editors | André van der Hoek |
| Number of pages | 6 |
| Publication status | Published - 2000 |
| Event | Software Configuration Management (SCM-10) - Toronto, Canada Duration: 0001 Jan 2 → … |
Conference
| Conference | Software Configuration Management (SCM-10) |
|---|---|
| Country/Territory | Canada |
| City | Toronto |
| Period | 0001/01/02 → … |
Subject classification (UKÄ)
- Computer Science
Free keywords
- software configuration management
- merging tools