Software Integration & Merging

Software Integration & Merging

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.

Related Publications

Related Resources

SMR Members

Katherine Patenio
Undergrad RA, 2020 - 2021
Max Ellis
Mehran Mahmoudi
MSc., 2016 - 2018
Moein Owhadi-Kareshk
MSc., 2017 - 2020
Sarah Nadi


Funding Sources

NSERC Samsung Global Research Outreach Program