| Conflict icon always when comparing models [message #1071088] |
Fri, 19 July 2013 06:19  |
Eclipse User |
|
|
|
Hi guys,
I'm not sure whether this is the correct place to ask, but when I
synchronize a resource with the repo, the conflicting mode icon is always
shown on the resource in the Synchronization view.
My background:
I want to versoning and merging Ecore models. I use EMF compare later on to
resolve conflicts. The thing is that even though the EMF compare editor does
not have conflicts (due to semantic instead of textual comparison), the
conflicting icon is shown. If I switch to the textual editor, there is of
course a conflict (due to textual conflicts, which can be resolved by EMF
compare). So, I guess the conflicting icon is based on the textual
comparison for Subversive, even though the resource is a model. Is that
right?
Regards,
Marc-Florian
|
|
|
|
Powered by
FUDForum. Page generated in 0.05654 seconds
Home