Re: merge with tree conflict

On Tue, Sep 29, 2009 at 03:56:08PM -0700, Vadym Chepkov wrote:
> Now I want to merge these changes into my working copy. The problem
> is, in a working copy I have one of the directories removed and when I
> try to merge I get a tree conflict.

Why did you remove a directory for a project that you, essentially, do
not control?

> svn merge ^/vendor/product/1.2 ^/vendor/product/current .
>
> --- Merging differences between repository URLs into '.':
> C install
> Summary of conflicts:
> Tree conflicts: 1
>
> $ svn st
> M .
> ! C install
> > local delete, incoming edit upon merge
>
> How can I skip the deleted directory changes and apply only the remaining changes? Thank you.

Your merge should continue happily beyond this point, merging all the
other needed changes and leaving the install directory for you to deal
with manually. Is this not what you're seeing? Can you post more of the
output from your svn merge command?

tyler

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-30 05:34:56 CEST