RE: resolve conflict dialog is confusing

> 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"?

BOb

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2857872

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-10-17 21:49:33 CEST