Write a Blog >>
ICSE 2020
Mon 5 - Sun 11 October 2020 Yongsan-gu, Seoul, South Korea
Mon 5 Oct 2020 14:00 - 14:20 at TBD3 - Version Control and Programming Practice

Divergent forks are a common practice in open-source software development to perform long-term, independent and diverging development on top of a popular source repository. However, keeping such divergent downstream forks in sync with the upstream source evolution poses engineering challenges in terms of frequent merge conflicts. In this paper, we conduct the first industrial case study of the implications of frequent merges from upstream and the resulting merge conflicts, in the context of Microsoft Edge development. The study consists of two parts. First, we describe the nature of merge conflicts that arise due to merges from upstream and classify them into textual conflicts, build breaks, and test failures. Second, we investigate the feasibility of automatically fixing a class of merge conflicts related to build breaks that consume a significant amount of developer time to root-cause and fix. Towards this end, we have implemented a tool MrgBldBrkFixer and evaluate it on three months of real Microsoft Edge Beta development data, and report encouraging results.

Mon 5 Oct

14:00 - 15:40: Paper Presentations - Version Control and Programming Practice at TBD3
icse-2020-Software-Engineering-in-Practice14:00 - 14:20
Chungha SungUniversity of Southern California, Shuvendu K. LahiriMicrosoft Research, Mike KaufmanMicrosoft Corporation, Pallavi ChoudhuryMicrosoft Corporation, Chao WangUSC
icse-2020-Journal-First14:20 - 14:35
Sruti Srinivasa RagavanMicrosoft Research; School of EECS, Oregon State University, Mihai CodobanMicrosoft, David PiorkowskiIBM Research AI, Danny DigSchool of EECS at Oregon State University, Margaret BurnettOregon State University
icse-2020-Journal-First14:35 - 14:50
Yusuf Sulistyo NugrohoNara Institute of Science and Technology, Hideaki HataNara Institute of Science and Technology, Kenichi MatsumotoNara Institute of Science and Technology
icse-2020-Journal-First14:50 - 15:05
Zhongxing YuKTH Royal Institute of Technology, Chenggang BaiBeihang University, Lionel Seinturier, Martin MonperrusKTH Royal Institute of Technology
icse-2020-papers15:05 - 15:25
Shurui ZhouCarnegie Mellon University, USA, Bogdan VasilescuCarnegie Mellon University, Christian KästnerCarnegie Mellon University
icse-2020-Journal-First15:25 - 15:40
Bowen XuSingapore Management University, Le AnPolytechnique Montreal, Ferdian ThungSingapore Management University, Foutse KhomhPolytechnique Montréal, David LoSingapore Management University