A Delta-Oracle for Fast Model Merge Conflict Estimation using Sketch-Based Critical Pair Analysis

Research output: Contribution to book/Conference proceedings/Anthology/ReportConference contributionContributedpeer-review

Contributors

Abstract

Conflicting changes are a major challenge in branch-based development and modeling. State-of-the-art research proposes continuous analysis via attempted three-way merges to find potential merge conflicts early on. These approaches are computation-heavy due to the necessity of comparing all variant combinations, ideally for each change. This work proposes a conflict approximation algorithm (oracle) for quick feedback. The oracle approximates conflicts using critical pair analysis on tracked delta sequences, providing a quick feedback loop. The oracle is paired with a classical slow-but-precise full model comparison algorithm, which is run occasionally to validate the oracle’s results. This work contributes the Sketch-based Critical Pair Analysis (SCPA) approach for fast merge conflict estimation. SCPA’s runtime depends only on the number of changes and not the model size. We evaluate SCPA against EMFCompare in different simulated model evolution scenarios. We found that for the investigated model sizes, SCPA is faster by a magnitude while the number of found conflicts strongly correlates with EMFCompare.

Details

Original languageEnglish
Title of host publicationMODELS Companion '24: Proceedings of the ACM/IEEE 27th International Conference on Model Driven Engineering Languages and Systems
Pages1046-1055
Number of pages10
ISBN (electronic)979-8-4007-0622-6
Publication statusPublished - 31 Oct 2024
Peer-reviewedYes

External IDs

Scopus 85212231904
ORCID /0000-0003-3479-661X/work/187997363
ORCID /0000-0002-3513-6448/work/187997843

Keywords

ASJC Scopus subject areas

Keywords

  • critical pair analysis, oracle algorithm, merge conflict estimation