History-based merging of models

Model-driven development in collaborative teams requires services for merging models. Such services should have the same quality as one is used to for source code. The constraints which are relevant in model driven engineering imply that the merging of models must be implemented differently than merging of texts. Based on the analysis of these constraints, we present an approach for merging models that attains a high level of consistency of the merged models and minimizes the loss of effort due to conflict resolution.