AW: Re: TSVN 1.8.6 & merge conflict, prefer repository => wrong behavior: chooses local

Hello!

As a sequel to this discussion:

I had to merge between to folders inside my working copy.
In such a setup there is nothing like "choose local" and "choose repository".
I was confused, but as far as I can tell I guessed right...

When I merge form /030_branches/my_workingbranch
to /040_trunk inside my working copy, what does "repository" mean? Which is which?

Would "present" and "incoming" or "destination" and "source" be more appropriate words?

Mit freundlichen Grüßen
Dr. Hartmut Niemann

Siemens AG
Mobility
MO MLT LM EN CCI 1
Werner-von-Siemens-Str. 67
91052 Erlangen, Deutschland
Tel.: +49 9131 7-34264
mailto:hartmut.niemann_at_siemens.com
e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-12-08 14:11:50 CET