Integrating noninterfering versions of programs
ACM Transactions on Programming Languages and Systems (TOPLAS)
Structure-oriented merging of revisions of software documents
SCM '91 Proceedings of the 3rd international workshop on Software configuration management
Change detection in hierarchically structured information
SIGMOD '96 Proceedings of the 1996 ACM SIGMOD international conference on Management of data
Meaningful change detection in structured data
SIGMOD '97 Proceedings of the 1997 ACM SIGMOD international conference on Management of data
MobiCom '98 Proceedings of the 4th annual ACM/IEEE international conference on Mobile computing and networking
Linux Journal
A State-of-the-Art Survey on Software Merging
IEEE Transactions on Software Engineering
A hybrid approach to optimistic file system directory tree synchronization
Proceedings of the 4th ACM international workshop on Data engineering for wireless and mobile access
Towards XML version control of office documents
Proceedings of the 2005 ACM symposium on Document engineering
Model-based version and configuration management for a web engineering lifecycle
Proceedings of the 15th international conference on World Wide Web
Merging distributed database summaries
Proceedings of the sixteenth ACM conference on Conference on information and knowledge management
Merging Hierarchically-Structured Documents in Workflow Systems
Electronic Notes in Theoretical Computer Science (ENTCS)
Merging changes in XML documents using reliable context fingerprints
Proceedings of the eighth ACM symposium on Document engineering
A Comparative Evaluation of XML Difference Algorithms with Genomic Data
SSDBM '08 Proceedings of the 20th international conference on Scientific and Statistical Database Management
Versioning XML-based office documents
Multimedia Tools and Applications
Efficient change control of XML documents
Proceedings of the 9th ACM symposium on Document engineering
Proceedings of the 9th ACM symposium on Document engineering
An ontology-driven process for unification of XML instances
Proceedings of the 14th Brazilian Symposium on Multimedia and the Web
Syxaw: Data Synchronization Middleware for the Mobile Web
Mobile Networks and Applications
Semantic-based Merging of RSS Items
World Wide Web
A formal investigation of Diff3
FSTTCS'07 Proceedings of the 27th international conference on Foundations of software technology and theoretical computer science
A formal approach to three-way merging of EMF models
Proceedings of the 1st International Workshop on Model Comparison in Practice
Using versioned tree data structure, change detection and node identity for three-way XML merging
Proceedings of the 10th ACM symposium on Document engineering
Achieving Data Consistency by Contextualization in Web-Based Collaborative Applications
ACM Transactions on Internet Technology (TOIT)
A probabilistic XML merging tool
Proceedings of the 14th International Conference on Extending Database Technology
An implementation for merging images for version control
ICCOMP'06 Proceedings of the 10th WSEAS international conference on Computers
XCC: change control of XML documents
Computer Science - Research and Development
Extending XForms with server-side functionality
Proceedings of the 27th Annual ACM Symposium on Applied Computing
XFormsDB: an extensible web application framework built upon declarative W3C standards
ACM SIGAPP Applied Computing Review
Model-based tool support for consistent three-way merging of EMF models
Proceedings of the workshop on ACadeMics Tooling with Eclipse
Version aware LibreOffice documents
Proceedings of the 2013 ACM symposium on Document engineering
RWS-Diff: flexible and efficient change detection in hierarchical data
Proceedings of the 22nd ACM international conference on Conference on information & knowledge management
Hi-index | 0.00 |
Three-way merging is a technique that may be employed for reintegrating changes to a document in cases where multiple independently modified copies have been made. While tools for three-way merge of ASCII text files exist in the form of the ubiquitous diff and patch tools these are of limited applicability to XML documents. We present a method for three-way merging of XML which is targeted at merging XML formats that model human-authored documents as ordered trees (e.g. rich text formats structured text drawings etc.). To this end we investigate a number of use cases on XML merging (collaborative editing propagating changes across document variants) from which we derive a set of high-level merge rules. Our merge is based on these rules. We propose that our merge is easy to both understand and implement yet sufficiently expressive to handle several important cases of merging on document structure that are beyond the capabilities of traditional text-based tools. In order to justify these claims we applied our merging method to the merging tasks contained in the use cases. The overall performance of the merge was found to be satisfactory. The key contributions of this work are: a set of merge rules derived from use cases on XML merging a compact and versatile XML merge in accordance with these rules and a classification of conflicts in the context of that merge.