The Private Life of Merge Conflicts
Abstract
References
Index Terms
- The Private Life of Merge Conflicts
Recommendations
What causes merge conflicts?
SBES '20: Proceedings of the XXXIV Brazilian Symposium on Software EngineeringDuring the software development process, several developers commonly change artifacts in parallel. A merge process can combine parallel changes. In the case of changes that cannot be automatically combined, the developer responsible for the merge must ...
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 ...
Predicting merge conflicts considering social and technical assets
AbstractConcurrent contributions to a code base may introduce merge conflicts. Whereas merge conflicts are easy and common to introduce, resolving them is a difficult, time-consuming, and often error-prone task. Previous research concentrated on the ...
Comments
Information & Contributors
Information
Published In
![cover image ACM Other conferences](/cms/asset/5950a88b-2b0e-4118-85bd-27221e2b6858/3555228.cover.jpg)
Publisher
Association for Computing Machinery
New York, NY, United States
Publication History
Check for updates
Author Tags
Qualifiers
- Research-article
- Research
- Refereed limited
Funding Sources
Conference
Acceptance Rates
Contributors
Other Metrics
Bibliometrics & Citations
Bibliometrics
Article Metrics
- 0Total Citations
- 52Total Downloads
- Downloads (Last 12 months)14
- Downloads (Last 6 weeks)0
Other Metrics
Citations
View Options
Login options
Check if you have access through your login credentials or your institution to get full access on this article.
Sign inFull Access
View options
View or Download as a PDF file.
PDFeReader
View online with eReader.
eReaderHTML Format
View this article in HTML Format.
HTML Format