Write a Blog >>
ICSE 2020
Wed 24 June - Thu 16 July 2020
Sat 11 Jul 2020 00:24 - 00:36 at Baekje - P25-Fuzzing Chair(s): Marcel Böhme

Merge conflicts are inevitable in collaborative software development and are disruptive. When they occur, developers have to stop their current work, understand the conflict and the surrounding code, and plan an appropriate resolution. However, not all conflicts are equally problematic—some can be easily fixed, while others might be complicated enough to need multiple people. Currently, there is not much support to help developers plan their conflict resolution. In this work, we aim to predict the difficulty of a merge conflict so as to help developers plan their conflict resolution. The ability to predict the difficulty of a merge conflict and to identify the underlying factors for its difficulty can help tool builders improve their conflict detection tools to prioritize and warn developers of difficult conflicts. In this work, we investigate the characteristics of difficult merge conflicts, and automatically classify them. We analyzed 6,380 conflicts across 128 java projects and found that merge conflict difficulty can be accurately predicted (AUC of 0.76) through machine learning algorithms, such as bagging.

Conference Day
Sat 11 Jul

Displayed time zone: (UTC) Coordinated Universal Time change

00:00 - 01:00
P25-FuzzingTechnical Papers at Baekje
Chair(s): Marcel BöhmeMonash University
00:00
12m
Talk
Typestate-Guided Fuzzer for Discovering Use-after-Free VulnerabilitiesTechnical
Technical Papers
Haijun WangAnt Financial Services Group, China; CSSE, Shenzhen University, China, Xiaofei XieNanyang Technological University, Yi LiNanyang Technological University, Cheng WenShenzhen University, Yuekang LiNanyang Technological University, Yang LiuNanyang Technological University, Singapore, Shengchao QinUniversity of Teesside, Hongxu ChenResearch Associate, Yulei SuiUniversity of Technology Sydney, Australia
Link to publication DOI Pre-print
00:12
12m
Talk
sFuzz: An Efficient Adaptive Fuzzer for Solidity Smart ContractsTechnical
Technical Papers
Tai D. NguyenSingapore Management University, Long H. PhamSingapore University of Technology and Design, Jun SunSingapore Management University, Yun LinNational University of Singapore, Minh Quang TranHo Chi Minh City University of Technology
00:24
12m
Talk
Planning for Untangling: Predicting the Difficulty of Merge ConflictsTechnical
Technical Papers
Caius BrindescuOregon State University, Iftekhar AhmedUniversity of California at Irvine, USA, Rafael LeanoOregon State University, Anita SarmaOregon State University
00:36
12m
Talk
Gang of Eight: A Defect Taxonomy for Infrastructure as Code ScriptsTechnicalArtifact Available
Technical Papers
Akond RahmanTennessee Tech University, Effat FarhanaNorth Carolina State University, Chris ParninNorth Carolina State University, Laurie WilliamsNorth Carolina State University
Pre-print
00:48
12m
Talk
JVM Fuzzing for JIT-Induced Side-Channel DetectionTechnical
Technical Papers
Tegan BrennanUniversity of California, Santa Barbara, Seemanta SahaUniversity of California Santa Barbara, Tevfik BultanUniversity of California, Santa Barbara