.png){kind=icon}
.png){kind=icon}
Return
Spork: Structured Merge for Java With Formatting Preservation
.png){kind=icon}
OA
AI
DOI：10.1109/TSE.2022.3143766.png)
.png){kind=icon}
Original request for help.png){kind=icon}
Share.png){kind=icon}
Save
Abstract
En 中文
The highly parallel workflows of modern software development have made merging of source code a common activity for developers. The state of the practice is based on line-based merge, which is ubiquitously used with & quot;git merge & quot;. Line-based merge is however a generalized technique for any text that cannot leverage the structured nature of source code, making merge conflicts a common occurrence. As a remedy, research has proposed structured merge tools, which typically operate on abstract syntax trees instead of raw text. Structured merging greatly reduces the prevalence of merge conflicts but suffers from important limitations, the main ones being a tendency to alter the formatting of the merged code and being prone to excessive running times. In this paper, we present spork, a novel structured merge tool for java. spork is unique as it preserves formatting to a significantly greater degree than comparable state-of-the-art tools. spork is also overall faster than the state of the art, in particular significantly reducing worst-case running times in practice. We demonstrate these properties by replaying 1740 real-world file merges collected from 119 open-source projects, and further demonstrate several key differences between spork and the state of the art with in-depth case studies.
Keywords:
Codes
Java
Merging
Syntactics
Semantics
Computer languages
Time complexity
Version control
structured merge
Journal
IF:
5.6
Papers:
2.8K
Citations:
1.1W