Re: resolve conflict dialog is confusing

On 14.10.2011 23:21, spongman wrote:
> On Oct 14, 1:58 pm, Stefan Küng<tortoise..._at_gmail.com> wrote:
>>> 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?
>
> again, for the 3rd time:
>
>>>> might it be possible to show, in the dialog, the path/URL/version of
>>>> both the 'local' and 'repository' entries that conflicted?
>
> maybe my English isn't clear?

Well, you mentioned that in a month old post. I only read your current
posts. You didn't quote that old, old post, and you didn't quote
anything from that post.
So sorry, but I don't keep such old posts in my inbox.

And the dialog already shows you the file that the conflict occurs on.
The url of the parts you want to merge, that's the url you entered in
the merge dialog.
I don't think that would really improve the dialog.

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