| [EMF Compare] 3 way match [message #621342] |
Mon, 31 August 2009 08:39 |
 Daniel
Messages: 34
Registered: July 2009 |
Member |
|
|
Hi,
Thank you for your work and effort.
My situation is the following: I have 3 Model instances,
File 1: a base,
File 2: a base file with some customisations
File 3: and another customized (further developed) base file, say new base.
I want to get the customisations of File 2 into file 3. Therefore i have
to solve some conflicts between those files.
Firstly I want to make sure that this is the right approach for the 3way
match.
I use the ressourceMatch() Method with the 3 Files, than created a Diff
out of it.
1 Question: How do I ignore changes which only affect the order of the
elements? (...has been moved from ... to)
2 Question: I get an Diff out of the 3way Matchmodel, but how do i get the
origin file of a DiffElement? So how do I know if the change was between
file 1 and 2 or 1 and 3?
3 Question: I've found a graphic with a "diff extensions" api marked. But
where and how do I use this api, and can I use it to manually solve the
conflicts with it?
Thank you in advance,
greetings
Daniel
|
|
|
Powered by
FUDForum. Page generated in 0.02159 seconds
] 
Search
Help
Register
Login
Home
