Re: resolve conflict dialog is confusing

Op 14 okt. 2011 23:46 schreef "spongman" <piersh_at_gmail.com> het volgende:
>
> On Oct 14, 2:34 pm, Stefan Küng <tortoise..._at_gmail.com> wrote:
> > And that's the same repository you're merging from. So there are no two
> > repositories, only one.
>
> the problem is not that there are two different repositories, there
> aren't.
>
> the problem is that there are two different buttons that both could
> refer to things that have (or are) repositories.
>
> they refer to two different locations in the same repository.
> ambiguous.

No, use local means 'use the changes present in my working copy'. And use
repository means 'use the changes coming in from the merged source' (if I
understand correctly). I don't see an ambiguity.

Regards,
Jean-Marc.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-10-14 23:55:06 CEST