[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: SteveKing <stefankueng_at_gmail.com>
Date: 2004-10-27 08:33:41 CEST

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!


  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
Received on Wed Oct 27 09:37:45 2004

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.