Re: How to resolve tree conflict with duplicate directories?

On 12.10.2009 19:26, Jack Alvrus wrote:
> Hi, we're running into a tree conflict that appears to be caused by
> directories with the same name having been added independently to two
> branches. The basic scenario is that we have a trunk and a feature
> branch that was branched from trunk:
>
> /trunk /branches/feature
>
> A directory with the same name was created independently on each
> branch:
>
> /trunk/newdirectory /branches/feature/newdirectory
>
> Now when we merge trunk into the feature branch, we get a tree
> conflict on newdirectory.
>
> How do we resolve this? All the documentation I've seen so far talks
> about files being deleted. I haven't found anything that covers this
> scenario.

You have to decide which of the folders you want to keep. The one from
the branch or the one from trunk.
If you want to use the one on the branch, just mark the conflict as
resolved.
If you want the one from trunk, you have to first delete the folder on
the branch, then do the merge.
If you want a mix of both folders, you have to do that manually.

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