EMF Ecore models are often used to generate code for data models in Eclipse applications. Even E4 uses EMF to describe its data, the workbench model. EMF Ecore models are stored in Ecore files and are version-controlled by a source code repository such as SVN, CVS or Git. However these repositories do not offer specific support for merging Ecore files and therefore merging is difficult and error-prone.
EMFStore offers support for conflict detection and merging including Ecore, but it requires the installation of a server instance in addition to the existing source code repository.
