Re: [TSVN] Tortoise does not show conflict after conflicted merge

On Wed, 27 Oct 2004 08:21:48 +0200, Thomas Börkel <tbo@ap-ag.com> wrote:

> I did a merge with Tortoise. It tells me, there is a conflict and I have the additional 3 files (.merge-left, .merge-right, .working) on disk. When I double-click on the file in the "merge finished" dialog, it shows the conflict editor, but it does not show the conflict there, just normal differences. Same, if I leave the merge dialog and choose "Edit conflicts" later from the context menu.
>
> Shall I post the original and the 3 additional files here? Or better the from and to revisions and the working copy? Or is there a known problem in 1.1.1?

In the TortoiseMerge settings, activate "compare whitespaces". Seems
the conflict is because of whitespace diffs, and if you ignore those
in TortoiseMerge, it won't show them as conflicted!

Stefan

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