On Wed, Aug 04, 2010 at 03:44:24PM +0000, Mark Wakim wrote: > I am working on a project where we have trunk, and a branch which I > will call BranchX. A couple weks ago I added a directory > (myDirectory) to trunk, I then did an svn copy to add that directory > to BranchX.
The best way to get changes from one branch to another is always to merge. > I am now merging the latest changes from trunk into BranchX, but I am > getting a conflict: > > C myDirectory > > local add, incoming add upon merge Right. The directory already exists in your branch, so svn is confused. This confusing is because, without doing a merge, svn has no way to know how the new directory ended up on your branch. > There are no code changes between myDirectory in trunk and BranchX. > Why am I getting this conflict? I thought svn copy was the proper way > to copy files/directories between branches? Does anyone know how I > can resolve this so that in future commits people will not have to > deal with this conflict again? If there are no changes, I would delete the directory from branchx and then merge from trunk to recreate the directory on branchx. tyler
