Simon Large wrote:
> 2009/5/8 <webpost_at_tigris.org>:
>> Hi all, I'm new to resolving conflicts but think I have my head around how TortoiseMerge is showing me the information, with the exception of one thing - the = line status indicator, which the manual tells me is "A change has been undone by reverting to the original content of the line".
>>
>> The thing I'm not sure of is - The original content of what line? How does TortoiseMerge know this?
>>
>> As far as I've read (and can see), the top left pane is the diff between the base and theirs, top right is the diff between base and mine, and the bottom of the result of the merge so far.
>>
>> So the top two panes show independant information of how they each differ from the base, yet they always seems to show these = lines in the same place, yet when comparing the base to theirs (in this case) the lines in questions shouldn't be removed as they are in both files.
>>
>> Any general info on what this ine type is would be good, as I want to fully udnerstand what I'm seeing.
>
> I think this is where the line has changed relative to the base, but
> both mine and theirs have the *same* change relative to base, so there
> is no conflict.
Yes. But even if TMerge doesn't show a conflict there, it still could be
a conflict: if TMerge is set to ignore eols/whitespace changes, then
lines that are conflicted won't show up as conflicted if that conflict
is only due to ignored changes (eol's, whitespaces). In that case, you
would see the = lines instead.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2115976
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-05-08 18:42:08 CEST