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

resolve conflict dialog is confusing

From: spongman <piersh_at_gmail.com>
Date: Thu, 19 Aug 2010 11:59:54 -0700 (PDT)

in the 'Resolve Conflict' dialog that shows during a merge there are
two buttons:

- Use local
- Use repository

the wording of these buttons is ambguous and confusing.

the term 'repository' is ambiguous since both branches are in the
repository, and this button does not disambiguate between them.

the term 'local' sin't much better - does it refer to my working copy
before the merge, the working copy after the failed merge, some other
local copy?

also, can we get accelerators for these (all!) buttons?


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-08-19 21:00:02 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.