Advanced Search

Browse by Discipline

Scientific Societies

E-print Alerts

Add E-prints

E-print Network

  Advanced Search  

Semistructured Merge: Rethinking Merge in Revision Control Systems

Summary: Semistructured Merge:
Rethinking Merge in Revision Control Systems
Sven Apel, Jörg Liebig,
Benjamin Brandl, Christian Lengauer
University of Passau, Germany
Christian Kästner
Philipps University Marburg, Germany
An ongoing problem in revision control systems is how to resolve
conflicts in a merge of independently developed revisions. Un-
structured 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
knowledge for conflict resolution. We propose semistructured revi-
sion control systems that inherit the strengths of both: the generality
of unstructured systems and the expressiveness of structured sys-
tems. The idea is to provide structural information of the underlying
software artifacts -- declaratively, in the form of annotated gram-
mars. This way, a wide variety of languages can be supported and
the information provided can assist in the automatic resolution of


Source: Apel, Sven - Fakultät für Informatik und Mathematik, Universität Passau


Collections: Computer Technologies and Information Sciences