merging trunk to a feature branch (conflicts on a directory)

Hi all,

I'm trying to merge changes that were made to a project trunk with a
local working copy (that is synchronized with a branch). I executed
the following from the root of my project directory:

    svn merge https://mysvn/myproject/trunk

So that came back with some info about conflicts. What I get now with a:

    svn status

is:

$ svn status
! C src
> local add, incoming add upon merge

src is a directory that exists on trunk and my branch, always has.

What I'd like it to do is add the files that I don't have and tell me
about the files that need to be merged manually. Anyone to coax the
tool into doing this?

Thanks,
Dave

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2409901

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-10-21 20:54:52 CEST