Directory Tree conflicts

I'm currently dealing with a Tree conflict on a directory and I'm unable
to find good information on resolving this using google (I keep finding
information on files), and am wondering what hte best approach is to
resolve this issue.

The background is that we have two developers working on features for a
project and each have their own branch that was created from trunk:

/trunk
/branch/featureA
/branch/featureB

At some point, both developers added a "lib" directory on their own in
each project with different libraries under that directory without
knowing the other one did so, so it ended up looking like:

/trunk
/branch/featureA
/branch/featureA/lib
/branch/featureA/lib/A
/branch/featureA/lib/B
/branch/featureB/lib
/brahcn/featureB/lib/C

The featureA developer finished their feature and we reintegrated it
back into /trunk, so now we had the state of:

/trunk
/trunk/lib
/trunk/lib/A
/trunk/lib/B
/branch/featureB/lib
/branch/featureB/C

When the second developer decided to update the feature branch with the
latest /trunk (using merge of course), we ran into the issue:

:branch/featureB$ svn merge ^/trunk
--- Merging r767 through r893 into '.':
    C lib
  U .
Summary of conflicts:
   Tree conflicts: 1

What is the best way to solve this issue? To quickly resolve this to get
things moving, I moved /branch/featureB/lib to
/branch/featureB/lib.move/, merged from /trunk successfully, and then
did a svn move on the contents from lib.move/ to the merged lib/, but I
was curious if there is a more correct way to do this.
Received on 2011-05-16 19:20:22 CEST