Re: Usability issue: Edit Tree Conflicts dialog

On 24.08.2009 14:15, Miguel Munoz Arancon wrote:
> Hi,
>
> I've noticed a small problem in the Edit Tree Conflicts dialog. It's not
> a bug, just a suggestion for improvement.
>
> The dialog displays the following information:
>
> Conflict sources
> * Source Left: ...
> * Source Right: ...
>
> And the available options (buttons) are:
>
> - Keep local (or something similar: in my case it's hidden)
> - Keep the file from the repository
> - Mark as resolved
>
> The problem is that it's the correspondence between left-right and
> repository-local is not obvious, so it's not clear what's the effect of
> clicking either button.
>
> I'd suggest either to change "source left" and "source right" with
> "repository" and "local", or change the text of the buttons to something
> like "keep the file from the repository (left)".

'left' and 'right' are not always 'repo' and 'local' but in most cases
both 'left' and 'right' are in the repository (three way merge, with
'local' being the target).

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2386904
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].