Hi!
For me, it seems like it is not possible to merge conflicts of web dynpro files (which are organized in a fusion). The only (working) options are to "accept colliding version" or "accept active version".
There is one other option called "Model merge", but it doesn't work as expected: No conflicts are displayed in the "Model merge" view although there are some conflicts.
Unfortunately it also isn't possible to manually merge colliding files as long as they belong to a fusion.
Can you tell me how you manage this problem, please?
Environment:
NetWeaver 7.3
NWDI with DTR and different tracks