Re: resolve conflict dialog is confusing

On 14.10.2011 22:47, spongman wrote:
> On Oct 14, 1:31 pm, Stefan Küng<tortoise..._at_gmail.com> wrote:
>>> might it be possible to show, in the dialog, the path/URL/version of
>>> both the 'local' and 'repository' entries that conflicted? that
>>> would certainly go a long way to clarify which term refers to which
>>> entry.
>>
>> You've complained that the dialog is confusing. And that you're confused
>> about the difference between 'repository' and 'working copy'.
>> Those two terms are maybe the most important terms when you're using any
>> version control system. I'm sorry, but if you don't understand what a
>> repository and a working copy is and how they're connected, then I don't
>> see how we could make that dialog any easier to understand.
>
> I understand what those terms mean. However, when you're doing a merge
> there are two repositories involved (the repository you're merging,
> and the repository associated with the working copy), and the meaning
> of the 'local' term is ambiguous - does it refer to the state of the
> working copy pre-merge or post-merge?

When you're merging, only _one_ repository is involved. This is SVN, not
a DVCS where you have multiple repositories.

And how is 'local' ambiguous?
The dialog asks you to choose which of the conflicting parts you want to
use. How can that refer to something post-merge? You can't choose
something that doesn't exist yet.

>> I don't think you can really use any version control system (not just
>> SVN but all others as well) if you don't understand those two terms.
>>
>> Do you have any suggestions on how that dialog could be improved?
>> Just telling that it's not clear won't help at all.
>
> yes, please read the paragraph you quoted from my last post, above.

I did. And you're not helping with such answers.
Please read your own paragraph yourself. You have not mentioned any
changes you want in that dialog to make it more clear or better to
understand. You only mentioned that it's not clear to you.

So again: how would you change that dialog to improve it?

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=2855327
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].