| | |
Summary: Semistructured Merge in Revision Control Systems
Sven Apel, J¨org Liebig, Christian Lengauer
Dept. of Informatics and Mathematics
University of Passau
{apel,joliebig,lengauer}@fim.uni-passau.de
Christian K¨astner
School of Computer Science
University of Magdeburg
ckaestne@ovgu.de
William R. Cook
Dept. of Computer Sciences
University of Texas at Austin
wcook@cs.utexas.edu
Abstract--Revision control systems are a major means to
manage versions and variants of today's software systems. An
ongoing problem in these systems is how to resolve conflicts
when merging independently developed revisions. Unstructured
revision control systems are purely text-based and solve conflicts
based on textual similarity. Structured revision control systems
are tailored to specific languages and use language-specific
|
