arrow
返回

ConflictBench: A benchmark to evaluate software merge tools

delete2024-08-01
delete0
PRE
AI
B
Bowen Shen *
N
Na Meng
DOI:10.1016/j.jss.2024.112084delete
delete原文链接
delete原文求助
delete分享
delete收藏
摘要

摘要

En 中文
In collaborative software development, programmers create branches for simultaneous program editing, and merge branches to integrate edits. When branches divergently edit the same text, the edits conflict and cannot get co -applied. Tools were built to automatically merge software branches, to detect conflicts, and to resolve conflicts along the way. However, there is no third -party benchmark or metric to comprehensively evaluate or compare those tools. This paper presents ConflictBench, our novel benchmark to evaluate software merge tools. ConflictBench consists of 180 merging scenarios extracted from 180 open -source Java projects. For each scenario, we sampled a conflicting chunk (i.e., conflict) reported by git-merge. Because git-merge sometimes wrongly reports conflicts, with our manual inspection, we labeled 136 of the 180 chunks as true conflicts, and 44 chunks as false conflicts. To facilitate tool evaluation, we also defined a systematic method of manual analysis toanalyze all program versions involved in each merging scenario, and to summarize the root causes as well as developers' resolution strategies. We further defined three novel metrics to evaluate merge tools. By applying five stateof-the-art tools to ConflictBench, we observed that ConflictBench is effective to characterize different tools. It helps reveal limitations of existing tools and sheds light on future research.
Keyword:
Empirical
Software merge
Conflict
Benchmark

期刊

Journal of Systems and Software 封面图
Journal of Systems and Software
IF:
4.1
论文数:
5.5K
被引数:
8.4K

机构

暂无机构信息
引用论文

引用论文

On the Nature of Merge Conflicts: A Study of 2,731 Open Source Java Projects Hosted by GitHub
err2020-08-01
err43
errOAAI
errGhiotto, Gleiph; Murta, Leonardo; Barros, Marcio; van der Hoek, Andre
err分享
err收藏
Awareness and knowledge of anal cancer in a community-recruited sample of HIV-negative and HIV-positive gay and bisexual men
err2019-01-01
err0
PREAI
errLance Feeney; Mary Poynten; Fengyi (Jeff) Jin; Craig Cooper; David J. Templeton; Matthew R. O'Dwyer; Andrew Grulich; Richard J. Hillman
err分享
err收藏
err分享
err收藏
Leveraging Structure in Software Merge: An Empirical Study
err2022-11-01
err8
PREAI
errSeibt, Georg; Heck, Florian; Cavalcanti, Guilherme; Borba, Paulo; Apel, Sven
err分享
err收藏
Modulation of vocal pitch control through high-definition transcranial direct current stimulation of the left ventral motor cortex
err2020-05-23
err0
PREAI
errRoozbeh Behroozmand; Karim Johari; Keiko Bridwell; Caroline Hayden; Danielle Fahey; Dirk-Bart den Ouden
err分享
err收藏
Estimating forest area at the year 1990 by two-phase sampling on historical remotely sensed imagery in Italy
err2017-01-20
err0
errOAAI
errPiermaria Corona; Lorenzo Fattorini; Gherardo Chirici; Riccardo Valentini; Marco Marchetti
err分享
err收藏
An empirical investigation into merge conflicts and their effect on software quality
err2019-09-05
err17
PREAI
errBrindescu, Caius; Ahmed, Iftekhar; Jensen, Carlos; Sarma, Anita
err分享
err收藏
没有更多内容