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

Re: Conflicts

From: Eric Lemes <ericlemes_at_gmail.com>
Date: Mon, 6 Oct 2008 08:31:11 -0200

Hi Dave,
Thanks. That's the answer I was looking for.

Strangely, because TortoiseSVN don't help us to solve the conflict. If you
click "ok" in the update window, and use the Edit Conflicts / Resolved in
the explorer context menu, you need to right click again to see "Resolve
conflict using mine".

Thanks,

Eric.

On Mon, Oct 6, 2008 at 6:18 AM, Dave Lawrence
<dlawrence_at_ad-holdings.co.uk>wrote:

> 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 12:31:22 CEST

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