Re: Tree conflict with folder added on branch and trunk

On Tue, Aug 5, 2014 at 1:26 PM, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
>> So what can I do to resolve the conflict manually? Do I just svn copy
>> the "lib" directory into my working copy? I cannot find an option in
>> the repository browser to copy with history to my working copy. Do I
>> need to drop to the command-line for this operation?
>
> You should not have created the same folders in your branch as you did
> on trunk.

OK, so I know what not to do in the future.

But since I already DID it, how do I move forward? The messages and
dialogs all imply I need to resolve the merge manually, but I don't
know how. Should I just svn copy the URL to the trunk's host/lib
directory into my working copy? If so, is there a way to do that in
TortoiseSVN without a second working copy, or should I just use the
command-line?

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-08-06 18:50:07 CEST