Re: [TSVN] Using WinMerge to resolve conflicts?

Shawn Oster wrote:
> All,

It's me ;-)

> Is anyone using WinMerge to resolve conflicts? I'm trying to get my
> team to switch from SourceSafe and when they come across their source
> file with <<<<< and >>>>> conflict markers it pretty much freaks them
> out. I'd like it so they never have to see the conflict markers and can
> do the full conflict resolution via WinMerge.

WinMerge does not provide a so called 3-way diff/merge. So you should
prefer KDiff3 or TortoiseSVN for this purpose.

Rainer

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Mar 21 19:52:15 2005