Eclipse Community Forums - RDF feed
https://www.eclipse.org/forums/
Eclipse Community Forums[EMF Compare] Problem with three way merge
https://www.eclipse.org/forums/index.php/mv/msg/195160/621617/#msg_621617
I'm trying to merge the contents of two instances of the same model using a
three (3) way merge after making a small change to each of the instaces but,
I am finding that the merged model contains only one set of changes, e.g.
the changes between ancestorEmfModel and remoteEmfModel. EMF compare is
removing the changes made in localEmfModel. This is the code that I'm
using:
Is there any way of ensuring that EMF compare does not remove the changes
that took place between ancestorEmfModel and localEmfModel so that after a
merge I end up with both sets of changes?