SoManyConflicts: Resolve Many Merge Conflicts Interactively and Systematically

Shen, Bo; Zhang, Wei; Yu, Ailun; Shi, Yifan; Zhao, Haiyan; Jin, Zhi

doi:10.1109/ase51524.2021.9678937

Cited by 5 publications

(1 citation statement)

References 23 publications

Supporting

Mentioning

Contrasting

Order By: Relevance

“…From these commits, we use the output of RefConfMiner in MergeScenarioMiner (Shen et al 2021) to collect the Java files involved in conflicting merge commits. It produces a folder for each conflicting commit ID, containing three sub-folders: the parts of the project involved in V0, the changed parts of the project in V1, and those in V2.…”

Section: Data Collectionmentioning

confidence: 99%

From two-way to three-way: domain-specific model differencing and conflict detection.

Jafarlou,

Syriani,

Alam

2023

JOT

View full text Add to dashboard Cite

In collaborative work, developers evolve their models in parallel, leading to substantial differences and conflicts.To better consolidate these changes, developers need to understand the differences in terms of syntax and semantics of the models. Despite myriad efforts, the existing version control systems and model comparison tools focus on the generic models, are hardly adaptable to a domain-specific language (DSL), and primarily present syntactical changes to the developer. Furthermore, they report differences and conflicts of domain-specific models based on their abstract syntax instead of the concrete syntax of the DSL. To address these issues, we previously introduced DSMCompare to detect fine-grained and semantic differences between pairs of model versions and present the changes in the concrete syntax of the DSL. In this paper, we have further enhanced our practice by considering a three-way model comparison, typical in the context of version control systems. DSMCompare can now report differences coming from either version as well as conflicts. To detect semantic differences and conflicts, our approach relies on the DSL engineer specifying semantic differencing patterns in an editor adapted to the DSL. To evaluate DSMCompare, we reverse-engineered the commit history of several open-source projects where Java-based code refactoring changes occur. We show that DSMCompare effectively finds these semantic differences and conflicts with high accuracy.

show abstract

Section: Data Collectionmentioning

confidence: 99%