Challenges of resolving merge conflicts: A mining and survey study

G Vale, C Hunsen, E Figueiredo… - IEEE Transactions on …, 2021 - ieeexplore.ieee.org
In collaborative software development, merge conflicts arise when developers integrate
concurrent code changes. Practitioners seek to minimize the number of merge conflicts …

Detecting semantic conflicts via automated behavior change detection

L Da Silva, P Borba, W Mahmood… - 2020 IEEE …, 2020 - ieeexplore.ieee.org
Branching and merging are common practices in collaborative software development. They
increase developer productivity by fostering teamwork, allowing developers to …

Reuse and maintenance practices among divergent forks in three software ecosystems

J Businge, M Openja, S Nadi, T Berger - Empirical Software Engineering, 2022 - Springer
With the rise of social coding platforms that rely on distributed version control systems,
software reuse is also on the rise. Many software developers leverage this reuse by creating …

Behind Developer Contributions on Conflicting Merge Scenarios

G Vale, E Fernandes, E Figueiredo… - 2023 IEEE 23rd …, 2023 - ieeexplore.ieee.org
Context: The success of Open Source Software (OSS) projects typically depends on
simultaneous contributions of several developers. These contributions often affect the same …

Towards developer support for merging forked test cases

S Schulze, J Krüger, J Wünsche - … of the 26th ACM International Systems …, 2022 - dl.acm.org
Developers rely on branching and forking mechanisms of modern versioning systems to
evolve and maintain their software systems. As a result, systems often exist in the form of …

[HTML][HTML] Detecting semantic conflicts with unit tests

L Da Silva, P Borba, T Maciel, W Mahmood… - Journal of Systems and …, 2024 - Elsevier
While modern merge techniques, such as 3-way and structured merge, can resolve textual
conflicts automatically, they fail when the conflict arises not at the syntactic, but at the …

Virtual Platform: Effective and Seamless Variability Management for Software Systems

W Mahmood, G Çalıklı, D Strüber… - IEEE Transactions …, 2024 - ieeexplore.ieee.org
Customization is a general trend in software engineering, demanding systems that support
variable stakeholder requirements. Two opposing strategies are commonly used to create …

The private life of merge conflicts

M Cunha, P Accioly, P Borba - … of the XXXVI Brazilian Symposium on …, 2022 - dl.acm.org
Collaborative development is an essential practice for the success of most nontrivial
software projects. However, merge conflicts might occur when a developer integrates …

Software product lines

A Wąsowski, T Berger - Domain-Specific Languages: Effective Modeling …, 2023 - Springer
We will now look at the application of MDSE for so-called software product lines—portfolios
of software variants in a particular application domain. We will discuss the systematic …

[PDF][PDF] An Empirical Study on the Correctness and Effort to Integrate Feature Models

V Bischoff, K Farias - Journal of Universal Computer Science, 2024 - researchgate.net
Feature model integration is pivotal in software development, particularly in evolving
software product lines through new feature accommodations. Despite its significance, the …