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
Identifying syntactic differences between two programs
Software—Practice & Experience
Program integration for languages with procedure calls
ACM Transactions on Software Engineering and Methodology (TOSEM)
Change detection in hierarchically structured information
SIGMOD '96 Proceedings of the 1996 ACM SIGMOD international conference on Management of data
The IceCube approach to the reconciliation of divergent replicas
Proceedings of the twentieth annual ACM symposium on Principles of distributed computing
Application-independent reconciliation for nomadic applications
EW 9 Proceedings of the 9th workshop on ACM SIGOPS European workshop: beyond the PC: new challenges for the operating system
A State-of-the-Art Survey on Software Merging
IEEE Transactions on Software Engineering
ACM SIGMOD Record
Version Management of XML Documents
Selected papers from the Third International Workshop WebDB 2000 on The World Wide Web and Databases
| Hi-index | 0.00 |
In an opensource development process developers work together using a revision control system. While getting multi-developers working products together into a single form, merge feature of revision control systems is used. Nowadays, merge operations in existing systems are commonly implemented with a line-by-line approach that can fail if two changes to the same line of code happen at the same time.In this paper, we propose a two-way merge algorithm for source code that exploit the tree structure of modern programming language grammar: the source code is transformed in an intermediate XML representation and the merge operation is conducted on the transformed version.We give an implementation of the algorithm for the Java language for the subversion revision control system.Experiments shown that the proposed algorithm gives more accurate merge result than the existing line-by-line algorithms.