Have you ever needed to compare and merge heterogeneous domain-specific models (with both textual and graphical syntaxes)? Or maybe you needed to review changes on graphical models? We did.
Diffing and merging all sorts of EMF-based models is important for many users working with modeling languages. EMF Compare is a mature framework addressing these tasks by supporting model comparison and merging for any EMF-based models. With EMF Compare users can determine changes they have applied to their models, identify overlaps between distinct models and merge changes that have been performed on the same model by different users in parallel.
However, there are many more use-cases for EMF Compare going beyond simply comparing and merging plain EMF Models. The diverse usage of EMF in practice poses several interesting and challenging requirements, where EMF Compare has been successfully adopted, ranging from diffing and merging inter-connected graphical (Sirius) and textual (Xtext) models to producing interactive HTML change reports of models, e.g., for model review and change approval.
In this talk, we present different interesting use-cases of EMF Compare in practice and discuss their challenges and implementation. Moreover, we give an update on what’s new in EMF Compare for Photon and how these new features can fuel even better support for model diff & merge.