Understanding the Impact of Branch Edit Features for the Automatic Prediction of Merge Conflict Resolutions
Abstract
References
Recommendations
Automatic prediction of developers’ resolutions for software merge conflicts
AbstractIn collaborative software development, developers simultaneously work in parallel on different branches that they merge periodically. When edits from different branches textually overlap, conflicts may occur. Manually resolving conflicts can be ...
Highlights- We conducted an empirical study to characterize merge conflicts in Java programs.
- Our study shows that 12 characteristics can be used to predict conflict resolutions.
- We created RPredictor to predict the resolution strategy given a ...
Can Program Synthesis be Used to Learn Merge Conflict Resolutions?: An Empirical Analysis
ICSE '21: Proceedings of the 43rd International Conference on Software EngineeringForking structure is widespread in the open-source repositories and that causes a significant number of merge conflicts. In this paper, we study the problem of textual merge conflicts from the perspective of Microsoft Edge, a large, highly collaborative ...
Understanding semi-structured merge conflict characteristics in open-source Java projects
Empirical studies show that merge conflicts frequently occur, impairing developers' productivity, since merging conflicting contributions might be a demanding and tedious task. However, the structure of changes that lead to conflicts has not been ...
Comments
Information & Contributors
Information
Published In
![cover image ACM Conferences](/cms/asset/4d7538d1-ab4f-45a1-8c9f-16662dd2d5ec/3643916.cover.jpg)
- Chair:
- Igor Steinmacher,
- Co-chair:
- Mario Linares-Vasquez,
- Program Chair:
- Kevin Patrick Moran,
- Program Co-chair:
- Olga Baysal
Sponsors
Publisher
Association for Computing Machinery
New York, NY, United States
Publication History
Check for updates
Qualifiers
- Research-article
Funding Sources
- NSF
- Universidad Rey Juan Carlos
- Saudi Arabian Cultural Mission (SACM)
- MCIN/AEI/10.13039/501100011033/FEDER, UE
Conference
Upcoming Conference
Contributors
Other Metrics
Bibliometrics & Citations
Bibliometrics
Article Metrics
- 0Total Citations
- 34Total Downloads
- Downloads (Last 12 months)34
- Downloads (Last 6 weeks)24
Other Metrics
Citations
View Options
Get Access
Login options
Check if you have access through your login credentials or your institution to get full access on this article.
Sign in