[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: Thomas Börkel <tbo_at_ap-ag.com>
Date: 2004-10-27 08:42:31 CEST


> > 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.
> 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!

You are right. It shows the conflict, if I activate "compare whitespaces". But then almost the whole diff is messed up, say unusable.

Can't I tell Tortoise or svn to ignore whitespaces in the first place (during the merge)?



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:47:22 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.