The browser you are using is not supported by this website. All versions of Internet Explorer are no longer supported, either by us or Microsoft (read more here: https://www.microsoft.com/en-us/microsoft-365/windows/end-of-ie-support).

Please use a modern browser to fully experience our website, such as the newest versions of Edge, Chrome, Firefox or Safari etc.

Support for consistent merge

På svenska

Author

Editor

  • André van der Hoek

Summary, in English

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.

Publishing year

2000

Language

English

Publication/Series

Proceedings of SCM-10, 10th International Workshop on Software Configuration Management: New Practices, New Challanges and New Boundaries

Document type

Conference paper

Topic

  • Computer Science

Keywords

  • software configuration management
  • merging tools

Conference name

Software Configuration Management (SCM-10)

Conference date

0001-01-02

Conference place

Toronto, Canada

Status

Published