[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 11:53:20 +0100

Eric Lemes wrote:
> 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".
>
But I think resolved now brings up an intermediate dialog, you can right
click on the file in there and get resolved using mine. You can also
get to these options from the check for modifications dialog. Stefan
said this was the reason why resolved using theirs/mine aren't in the
main context menu.

Perhaps they should be in the extended (shift-right-click) context menu?

---------------------------------------------------------------------
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:53:38 CEST

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