Publisher Summary This chapter defines the Merge operator for model merging, both
generically and for a specific meta-meta-model, Vanilla. It defines and classifies the conflicts
that arise in combining two models and describes when conflicts from different classes must
be resolved. Resolution strategies for conflicts that must be resolved in Merge, both for
Vanilla and in general are presented. The chapter evaluates Merge by showing how Merge
in Vanilla can be used to subsume some previous merging algorithms and by testing Merge …