Planning for Untangling: Predicting the Difficulty of Merge ConflictsTechnical
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.
Sat 11 JulDisplayed time zone: (UTC) Coordinated Universal Time change
00:00 - 01:00 | |||
00:00 12mTalk | Typestate-Guided Fuzzer for Discovering Use-after-Free VulnerabilitiesTechnical Technical Papers Haijun Wang Ant Financial Services Group, China; CSSE, Shenzhen University, China, Xiaofei Xie Nanyang Technological University, Yi Li Nanyang Technological University, Cheng Wen Xidian University, Yuekang Li Nanyang Technological University, Yang Liu Nanyang Technological University, Singapore, Shengchao Qin University of Teesside, Hongxu Chen Research Associate, Yulei Sui University of Technology Sydney, Australia Link to publication DOI Pre-print | ||
00:12 12mTalk | sFuzz: An Efficient Adaptive Fuzzer for Solidity Smart ContractsTechnical Technical Papers Tai D. Nguyen Singapore Management University, Long H. Pham Singapore University of Technology and Design, Jun Sun Singapore Management University, Yun Lin National University of Singapore, Minh Quang Tran Ho Chi Minh City University of Technology | ||
00:24 12mTalk | Planning for Untangling: Predicting the Difficulty of Merge ConflictsTechnical Technical Papers Caius Brindescu Oregon State University, Iftekhar Ahmed University of California at Irvine, USA, Rafael Leano Oregon State University, Anita Sarma Oregon State University | ||
00:36 12mTalk | Gang of Eight: A Defect Taxonomy for Infrastructure as Code ScriptsTechnical Technical Papers Akond Rahman Tennessee Tech University, Effat Farhana North Carolina State University, Chris Parnin North Carolina State University, Laurie Williams North Carolina State University Pre-print | ||
00:48 12mTalk | JVM Fuzzing for JIT-Induced Side-Channel DetectionTechnical Technical Papers Tegan Brennan University of California, Santa Barbara, Seemanta Saha University of California Santa Barbara, Tevfik Bultan University of California, Santa Barbara | ||