Advanced

Support for consistent merge

Asklund, Ulf LU and Magnusson, Boris LU (2000) Software Configuration Management (SCM-10) In Proceedings of SCM-10, 10th International Workshop on Software Configuration Management: New Practices, New Challanges and New Boundaries
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.
Please use this url to cite or link to this publication:
author
organization
publishing date
type
Chapter in Book/Report/Conference proceeding
publication status
published
subject
keywords
software configuration management, merging tools
in
Proceedings of SCM-10, 10th International Workshop on Software Configuration Management: New Practices, New Challanges and New Boundaries
editor
van der Hoek, André and
pages
6 pages
conference name
Software Configuration Management (SCM-10)
language
English
LU publication?
yes
id
383e4349-e035-4ede-9dba-476db21380d7 (old id 526384)
date added to LUP
2007-09-12 16:16:15
date last changed
2016-04-16 12:22:34
@inproceedings{383e4349-e035-4ede-9dba-476db21380d7,
  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.},
  author       = {Asklund, Ulf and Magnusson, Boris},
  booktitle    = {Proceedings of SCM-10, 10th International Workshop on Software Configuration Management: New Practices, New Challanges and New Boundaries},
  editor       = {van der Hoek, André},
  keyword      = {software configuration management,merging tools},
  language     = {eng},
  pages        = {6},
  title        = {Support for consistent merge},
  year         = {2000},
}