SVN tree conflict issue

Question

I am getting the tree conflict message as mentioned below -

514 (dev) dev:/export/home/user> svn status
 M      .
!     C ABC_NY
      >   local delete, incoming edit upon merge
Summary of conflicts:
  Tree conflicts: 1

What I did:

Created a feature branch from the trunk.
Did some changes in trunk; deleted few junk files from trunk.
Merged trunk to the feature branch. Everything was working fine till this point.
Did some changes in the feature branch; now the feature branch is ready for a release to PROD.
Tried merging the feature branch to trunk and having this conflict error.

Not sure why I am getting this error and how to avoid it.

Thanks.

David W. · Accepted Answer · 2013-05-30 01:43:36Z

0

This is saying that a file/directory was edited on the branch that was deleted locally on the trunk.

So, check the following:

Was ABC_NY modified on the branch since the last merge (or the creation of the branch) from trunk.
Is ABC_NY still on the trunk?
Was this directory/file removed or renamed on trunk?

You can always do a svn resolved ABC_NY to temporarily remove the conflict, and then handle it manually. However, I always recommend that you use the --dry-run parameter when you merge, and see where there might be possible conflicts, and then handle those conflicts before the actual merge takes place.

answered May 30, 2013 at 1:43

David W.

107k40 gold badges224 silver badges349 bronze badges

Sign up to request clarification or add additional context in comments.

Collectives™ on Stack Overflow

SVN tree conflict issue

1 Answer 1

Comments

Your Answer

Hot Network Questions

Collectives™ on Stack Overflow

1 Answer 1

Comments

Your Answer

Sign up or log in

Post as a guest

Related