Blame Trees

We consider the problem of merging individual text documents, motivated by the single-file merge algorithms of document-based version control systems. Abstracting away the merging of conflicting edits to an external conflict resolution function (possibly implemented by a human), we consider the effi...

Full description

Bibliographic Details
Main Authors: Demaine, Erik D., Panchekha, Pavel, Wilson, David A., Yang, Edward Z.
Other Authors: Massachusetts Institute of Technology. Department of Electrical Engineering and Computer Science
Format: Article
Language:en_US
Published: Springer-Verlag Berlin Heidelberg 2014
Online Access:http://hdl.handle.net/1721.1/86223
https://orcid.org/0000-0003-3803-5703