I sometimes get conflicts of the type depicted on the screenshot
(attached as SampleConflict.png). It would be very helpful if
TortoiseMerge would detect that the bottom three lines of the
bmp.SetAttribute (AutoRefresh, TRUE);
bmp.SetAttribute (UseResData, TRUE);
bmp.SetAttribute (ProportDisp, TRUE);
were successfully merged, thus reducing the area of conflict.
Since currently those lines are highlighted in red, I have to
visually compare the lines to see whether they are truly different
As far as I understand the TortoiseMerge's visual clues, it displays
a stroke out area, and immediately after it either yellow area
(replacing the stroke out) or the red area indicating a conflicting
replacement follows. A white area is a piece of text that was not
I think it would introduce NO inconsistency if it were to display a
combination of red and yellow areas following a stroke out area. In
my case the red area of the true conflict would be followed by the
three lines of yellow area, where a successful merge is detected.
The white area would still separate the different changes.
There is no need for a complicated matching algorithm to find merged
and truly conflicted areas inside a conflict, just a simple
line-based walk from the beginning and from the end of the conflict
would suffice. The goal is to narrow down the conflicted area as
much as possible.
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-02-13 14:37:36 CET