Re: Conflict Resolve Issue 2:

Anthony wrote:
> I use an external program (Kdiff) for merges/conflict resolutions. The
> issue I have is that it seems to not use the Kdiff first. For example,
> when I do an update and a conflict comes up, I then double click to
> edit/resolve. It then launches Kdiff and Kdiff says all merged and no
> conflicts. Why is this? Does TSVN use it’s own merge first? Does
> anyone else experience this?

If KDiff says everythings fine, then check the settings: you might have
some enabled like "ignore line endings", "ignore space changes" or
something like that. If the conflict is due to such changes, KDiff would
ignore them and therefore not see a conflict.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org