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

Re: invalid menu options in merge dialog

From: spongman <piersh_at_gmail.com>
Date: Tue, 21 Sep 2010 13:36:12 -0700 (PDT)

On Sep 21, 1:34 pm, spongman <pie..._at_gmail.com> wrote:
> in the merge dialog, after a merge is complete, you can right-click on
> a tree conflict and choose "Resolve conflict using 'theirs'" (or mine)
> and you get an error dialog stating that "Tree conflicts can only be
> resolved to 'working' state..."
> If I have selected an homogeneous list of items for which a menu item
> is invalid - don't show me that menu item!

also, in those cases, how about adding 'keep file from repository/
local' menu items?


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-09-21 22:36:19 CEST

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