Detecting Higher-Order Merge Conflicts in Large Software Projects

Wuensche, Thorsten; Andrzejak, Artur; Schwedes, Sascha

doi:10.1109/icst46399.2020.00043

Cited by 7 publications

(2 citation statements)

References 22 publications

Supporting

Mentioning

Contrasting

Order By: Relevance

“…Wuensche et al [47] classify build and test conflicts. Their approach creates a directed call graph of the code and its modifications to detect a conflict if: i) changes are made on the same call graph node, ii) there is a path from one change to another, or iii) there is a path from an unchanged node to two changed nodes.…”

Section: A Program Analysis Approachesmentioning

confidence: 99%

Symbolic Execution to Detect Semantic Merge Conflicts

Muylaert,

Härtel,

De Roover

2023

2023 IEEE 23rd International Working Conference on Source Code Analysis and Manipulation (SCAM)

View full text Add to dashboard Cite

show abstract

Section: A Program Analysis Approachesmentioning

confidence: 99%

Symbolic Execution to Detect Semantic Merge Conflicts

Muylaert,

Härtel,

De Roover

2023

2023 IEEE 23rd International Working Conference on Source Code Analysis and Manipulation (SCAM)

View full text Add to dashboard Cite

show abstract

“…We know nothing about the state S 12 after applying c 1 and c 2 . S 12 could contain so-called higher order merge conflicts [12,88] where, for example, c 1 starts to call a function, but c 2 changes the results of this function. As we need to integrate the given number of changes per day into our code repository, we accept the risk of such conflicts and execute pre-submit tests in parallel.…”

Section: Pre-submit Testingmentioning

confidence: 99%

Testing Very Large Database Management Systems: The Case of SAP HANA

et al. 2022

View full text Add to dashboard Cite

Software Testing is an established activity in the software development process to ensure and improve the quality of a software. Consequently, there exists a wide range of literature, popular information, and even multiple ISO standards covering this topic. However, we found that testing very large database management systems (DBMS) requires special adaptations of the generally available guidance for software testing and requires to solve specific challenges that may not be relevant for other areas or smaller software projects. We therefore discuss the testing of SAP HANA, a very large software project with millions of lines of code, to share insights about our approach, best practices, and unsolved challenges that are open for further research.

show abstract

Predicting merge conflicts considering social and technical assets

Vale,

Costa,

Apel

2023

Empir Software Eng

View full text Add to dashboard Cite

Concurrent 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 emergence of merge conflicts considering technical assets in their analyses and often ignored the social perspective (e.g., developer roles). Our goal is to understand and predict merge conflicts considering social and technical assets. We devise three models for predicting merge conflicts based on common measures used by developers. The first model focuses on the social assets, the second on technical assets, and the third on technical and social assets. To evaluate our predictors, we report on a large-scale empirical study analyzing the histories of 66 real-world software systems. Specifically, we categorize developers into top or occasional contributors at project and merge-scenario level. We found that top contributors at project level and occasional contributors at merge-scenario level cause more merge conflicts than the other roles. Hence, the coordination of top contributors at project level and occasional contributors at merge-scenario level is a good starting point to minimize the occurrence of merge conflicts (especially because when these two developers work on the source branch, the chances of merge conflicts are 32.31%). Overall, we show that predicting merge conflicts incorporating developer roles is possible in practice with high accuracy (0.92) and recall (1.00) when combining technical and social assets, which is vital information to guide improvements on speculative merging techniques.

show abstract

Detecting Higher-Order Merge Conflicts in Large Software Projects

Cited by 7 publications

References 22 publications

Symbolic Execution to Detect Semantic Merge Conflicts

Symbolic Execution to Detect Semantic Merge Conflicts

Testing Very Large Database Management Systems: The Case of SAP HANA

Predicting merge conflicts considering social and technical assets

Contact Info

Product

Resources

About