SoManyConflicts: Resolve Many Merge Conflicts Interactively and Systematically
Thu 18 Nov 2021 21:50 - 21:55 at Kangaroo - Learning Applications Chair(s): Michael Pradel
Code merging plays an important role in collaborative software development. However, it is often tedious and error-prone for developers to manually resolve merge conflicts, especially when there are many conflicts after merging long-lived branches or parallel versions. In this paper, we present \emph{SoManyConflicts}, a language-agnostic approach to help developers resolve merge conflicts systematically and interactively, by utilizing relations between merge conflicts. \emph{SoManyConflicts} employs a graph representation to model the relations between merge conflicts (e.g., dependency, similarity, etc.), and provides 3 major features: 1) suggest an order of resolution to the developer by clustering conflicts into different groups based on graph connectivity; 2) suggest related conflicts of the currently-focused conflict to the developer based on topological sorting, 3) suggest resolution strategies for unresolved conflicts based the set of already resolved conflicts. We have implemented \emph{SoManyConflicts} as a Visual Studio Code extension that supports multiple languages (Java, JavaScript, and TypeScript, etc.), which is briefly introduced in the video: https://youtu.be/_asWh_j1KTU. The source code is publicly available at: https://github.com/Symbolk/somanyconflicts.
Tue 16 NovDisplayed time zone: Hobart change
22:00 - 23:00 | Tool Demo (1)Tool Demonstrations at Kangaroo Chair(s): Sridhar Chimalakonda RISHA Lab, Indian Institute of Technology, Tirupati | ||
22:00 2mTalk | EvoMe: A Software Evolution Management Engine Based on Differential Factbase Tool Demonstrations Xiuheng Wu Nanyang Technological University, Mengyang Li Nanyang Technological University, Yi Li Nanyang Technological University, Singapore Pre-print | ||
22:02 2mTalk | Revizor: A Data-Driven Approach to Automate Frequent Code Changes Based on Graph Matching Tool Demonstrations Oleg Smirnov JetBrains Research, Saint Petersburg State University, Artyom Lobanov JetBrains Research, Yaroslav Golubev JetBrains Research, Elena Tikhomirova JetBrains Research, Timofey Bryksin JetBrains Research; HSE University Pre-print | ||
22:04 2mTalk | SoManyConflicts: Resolve Many Merge Conflicts Interactively and Systematically Tool Demonstrations | ||
22:06 2mTalk | Automated Code Refactoring upon Database-Schema Changes in Web Applications Tool Demonstrations Sophie Xie Whitney Young High School, Junwen Yang University of Chicago, Shan Lu University of Chicago | ||
22:08 2mTalk | BeAFix: An Automated Repair Tool for Faulty Alloy Models Tool Demonstrations Simón Gutiérrez Brida University of Rio Cuarto and CONICET, Argentina, Germán Regis Universidad Nacional de Río Cuarto, Guolong Zheng University of Nebraska Lincoln, Hamid Bagheri University of Nebraska-Lincoln, ThanhVu Nguyen George Mason University, Nazareno Aguirre University of Rio Cuarto and CONICET, Argentina, Marcelo F. Frias Dept. of Software Engineering Instituto Tecnológico de Buenos Aires | ||
22:10 2mTalk | RefactorInsight: Enhancing IDE Representation of Changes in Git with Refactorings Information Tool Demonstrations Zarina Kurbatova JetBrains Research, Vladimir Kovalenko JetBrains Research, Ioana Savu Delft University of Technology, Bob Brockbernd Delft University of Technology, Dan Andreescu Delft University of Technology, Matei Anton Delft University of Technology, Roman Venediktov Higher School of Economics, Elena Tikhomirova JetBrains Research, Timofey Bryksin JetBrains Research; HSE University Pre-print | ||
Thu 18 NovDisplayed time zone: Hobart change
21:00 - 22:00 | Learning ApplicationsResearch Papers / Tool Demonstrations / Journal-first Papers at Kangaroo Chair(s): Michael Pradel University of Stuttgart | ||
21:00 20mTalk | Deep GUI: Black-box GUI Input Generation with Deep Learning Research Papers Faraz YazdaniBanafsheDaragh University of California, Irvine, Sam Malek University of California at Irvine, USA | ||
21:20 20mTalk | Towards Exploring the Limitations of Active Learning: An Empirical Study Research Papers Qiang Hu University of Luxembourg, Yuejun GUo University of Luxembourg, Maxime Cordy University of Luxembourg, Luxembourg, Xiaofei Xie Kyushu University, Wei Ma University of Luxembourg, Mike Papadakis University of Luxembourg, Luxembourg, Yves Le Traon University of Luxembourg, Luxembourg | ||
21:40 10mTalk | Machine Learning based Success Prediction for Crowdsourcing Software Projects Journal-first Papers Inam Illahi Beijing Institute of Technology, Hui Liu Beijing Institute of Technology, Qasim Umer Beijing Institute of Technology, Nan Niu University of Cincinnati | ||
21:50 5mTalk | SoManyConflicts: Resolve Many Merge Conflicts Interactively and Systematically Tool Demonstrations | ||