Software Integration

Helping developers with software evolution & merge conflicts

Multiple versions of a software system can exist for various reasons, such as developing an SPL or simply forking or branching a repo to work on a given feature. At one point, these versions need to be integrated. Such integration is not an easy task since there may be conflicting changes in the code, textually, syntactically, and semantically. In this work, we look at how we can facilitate such integrations and how we can help developers merge their code more easily with less conflicts.

[1, 2, 3, 4, 5, 6, 7, 5]

Related Resources

Related Publications

2023

  1. TSE
    Operation-Based Refactoring-Aware Merging: An Empirical Evaluation
    Max Ellis, Sarah Nadi, and Danny Dig
    IEEE Transactions on Software Engineering, Nov 2023
    DOI PDF Code

2022

  1. EMSE
    Reuse and Maintenance Practices among Divergent Forks in Three Software Ecosystems
    John Businge, Moses Openja, Sarah Nadi, and Thorsten Berger
    Empirical Software Engineering, Nov 2022
    DOI PDF

2019

  1. SANER
    Are Refactorings to Blame? An Empirical Study of Refactorings in Merge Conflicts
    Mehran Mahmoudi, Sarah Nadi, and Nikolaos Tsantalis
    In Proc. of the 26th IEEE International Conference on Software Analysis, Evolution and Reengineering (SANER ’19), Nov 2019
    DOI PDF
  2. MSR
    Scalable Software Merging Studies with MERGANSER
    Moein Owhadi-Kareshk, and Sarah Nadi
    In Proceedings of the 16th International Conference on Mining Software Repositories (MSR ’19) , Nov 2019
    DOI PDF Code
  3. ESEM
    Predicting Merge Conflicts in Collaborative Software Development
    Moein Owhadi-Kareshk, Sarah Nadi, and Julia Rubin
    In Proceedings of the ACM/IEEE International Symposium on Empirical Software Engineering and Measurement (ESEM ’19), Nov 2019
    DOI PDF

2018

  1. MSR
    The Android Update Problem: An Empirical Study
    Mehran Mahmoudi, and Sarah Nadi
    In Proceedings of the 15th International Conference on Mining Software Repositories (MSR ’18), Nov 2018
    DOI PDF
  2. ICSME
    Clone-Based Variability Management in the Android Ecosystem
    John Businge, Openja Moses, Sarah Nadi, Engineer Bainomugisha, and Thorsten Berger
    In Proc. of the 34th International Conference on Software Maintenance and Evolution (ICSME ’18) – Industry Track, Nov 2018
    DOI PDF

Collaborators

Funding