conflict not resolved if left and right need to be combined

[antonmos]

I am merging a multi-line conflict where i need to take a combination of changes from left and right.
I tried doing it in 2 ways:
1) take left and hand-edit the change that i need from right
2) take 1 line from left (ctrl+click then replace from left), then take 2nd line from right

in both cases, the "change" that i am working on returns to yellow (conflict) status.

This is confusing, because I resolved the conflict but it still appears as one.
Is this by design and why?

Thanks!

[jeffhostetler]

Yes, sorry. DiffMerge computes a live diff of the 3 files after every edit.
After you make all of the changes and take stuff from both the left and
right sides, it still wants to compare the left/right sides with the NEW
middle. So it sees 3 different versions of the block of text and marks it
a conflict.

Doing a live diff has some interesting properties, but it does have a few
drawbacks. These include the problem you describe and also we lose
the ability to deal with the changes as a static list. So we can't do some
things like marking changes as addressed w or w/o applying a patch.

I'd like to change it to do a one-time diff and have those other features
and then only re-diff upon request (and have a re-diff toolbar button
or something).

I've logged a feature request to investigate this further.

sorry for the confusion,
jeff

14649

[antonmos]

Yes, single diff and a rediff button would work for me.
Thanks