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

Re: Conflicts

From: Dave Lawrence <dlawrence_at_ad-holdings.co.uk>
Date: Mon, 06 Oct 2008 09:18:13 +0100

Eric Lemes wrote:
> Hi there,
>
> I have a question about conflict resolution in TortoiseSVN. I'm
> currently using TSVN 1.5.3. <http://1.5.3.> within a 1.4.2 server.
>
> When I do an update and a conflict files appear, I first edit the
> conflicts (with Araxis Merge) and left the ".mine" file in the correct
> state. Then I click in "Resolved".

Since you resolved into the .mine file, click "resolved using mine".
This is how I used to merge with Araxis. (sometimes I might merge into
the ".newrev" file and use "resolved using theirs", yes this does work,
"resolved using theirs" is not the same as "revert" as you might think!)

It sounds to me like you specified Araxis as the tool and just allowed
TSVN to call it with the default parameters. There is an alternative
setup, as recommended on both the Araxis website and the TSVN help. In
that setup you merge into the common ancestor file in the middle (the
".oldrev" file), but when you click save, changes to the middle file
don't actually overwrite that file, they overwrite the one that's got
the conflict markers. For that setup, use "resolved".

That said, I found it easier to stick with the "default" .mine solution.

Also, it's worth spending some time trying to get your head round
Tortoise Merge, because it has the advantage that you only have to merge
the conflicted lines, the rest is done for you. With either of the two
Araxis configurations, you have to merge everything.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-10-06 10:18:36 CEST

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