EMF Diff/Merge: a diff/merge tool for models
Merging models is a common need in model-based activities, not only for version control but for model manipulation in general. However, merging models is much more complex than merging source code. Since EMF models are rich data structures with constraints and behavior, merging them consistently is a delicate problem.
EMF Diff/Merge aims to help solve that problem thanks to consistency rules and merge policies.
Check the Wiki page for more information.
Incubation
