Affiliation:
1. Tsinghua University, China
Abstract
Resolving conflicts is the main challenge for software merging. The existing merge tools usually rely on the developer to manually resolve conflicts. This is of course inefficient. We propose an interactive approach for resolving merge conflicts. To the best of our knowledge, this is the first attempt for conflict resolution of structured merge. To represent the possibly very large set of candidate programs, we propose an expressive and efficient representation by version space algebra. We also design a simple mechanism for ranking resolutions in the program space, such that the top-ranked resolution is very likely to meet the developer's expectation. We prototype our approach as a merge tool AutoMerge, and evaluate it on 244 real-world conflicts arising from 10 open-source projects. Results show great practicality of our approach.
Funder
National Natural Science Foundation of China
Publisher
Association for Computing Machinery (ACM)
Subject
Safety, Risk, Reliability and Quality,Software
Reference36 articles.
1. Semistructured merge
2. Taweesup Apiwattanapong Alessandro Orso and Mary Jean Harrold. 2007. JDiff: A differencing technique and tool for objectoriented programs. Automated Software Engineering 14 1 (01 Mar 2007) 3–36. 10.1007/s10515-006-0002-0 Taweesup Apiwattanapong Alessandro Orso and Mary Jean Harrold. 2007. JDiff: A differencing technique and tool for objectoriented programs. Automated Software Engineering 14 1 (01 Mar 2007) 3–36. 10.1007/s10515-006-0002-0
3. Ringer: web automation by demonstration
4. Optimizing synthesis with metasketches
5. Jim Buffenbarger. 1995. Syntactic software merging. In Software Configuration Management Jacky Estublier (Ed.). Springer Berlin Heidelberg Berlin Heidelberg 153–172. Jim Buffenbarger. 1995. Syntactic software merging. In Software Configuration Management Jacky Estublier (Ed.). Springer Berlin Heidelberg Berlin Heidelberg 153–172.
Cited by
20 articles.
订阅此论文施引文献
订阅此论文施引文献，注册后可以免费订阅5篇论文的施引文献，订阅后可以查看论文全部施引文献