Support for consistent merge

Research output: Chapter in Book/Report/Conference proceedingPaper in conference proceedingResearchpeer-review

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 languageEnglish
Title of host publicationProceedings of SCM-10, 10th International Workshop on Software Configuration Management: New Practices, New Challanges and New Boundaries
EditorsAndré van der Hoek
Number of pages6
Publication statusPublished - 2000
EventSoftware Configuration Management (SCM-10) - Toronto, Canada
Duration: 0001 Jan 2 → …

Conference

ConferenceSoftware Configuration Management (SCM-10)
Country/TerritoryCanada
CityToronto
Period0001/01/02 → …

Subject classification (UKÄ)

  • Computer Science

Keywords

  • software configuration management
  • merging tools

Cite this