Re: resolve conflict dialog is confusing

On 17.10.2011 21:49, Bob Archer wrote:
>> On Oct 14, 1:52 pm, Andy Levy<andy.l..._at_gmail.com> wrote:
>>> Subversion does not support merging between two repositories, so
>>> either your understanding or your terminology *is* wrong somewhere
>>> along the way here.
>>
>> i am aware of that. however the working copy has an associated repository,
>> and, for me at least, it's not obvious from the wording of the dialog that
>> 'repository' does NOT refer to the repository of the working copy.
>
> Local is the working copy that is the target of the merge.
>
> Didn't it used to say "Mine" "Theirs"?

Yes, but apparently that was even more confusing.

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