Geek Answers Handbook

SVN resolves merge tree conflict

I have a conflict with the SVN tree, which I cannot figure out how to solve, and I hope that you guys (girls) can help.

Here's the situation: I created A branch from the trunk to do some development. Then I created branch B from branch A. Both branches are developing at the same time.

At some point, I selected some revisions from cherry branch B to the trunk to get some of the features developed in branch B.

Now I have synchronized branch A from the trunk:

~/branch_a$ svn merge ^/trunk
~/branch_a$ svn commit

There is no problem. The next step is to synchronize B with A:

~/branch_b$ svn merge ^/trunk

Here I get some tree conflicts in the / dirs files that already existed in the trunk before the merge, but were changed in the cherry picks I did earlier (I don't know if this has anything to do with this, I just mention it) :

  C some_dir/other_dir/some_file.php
  >   local add, incoming add upon merge
  C some_other_dir/some_sub_dir
  >   local add, incoming add upon merge

, , , , . ?

!

+4
2

, , .

http://www.sepcot.com/blog/2007/04/SVN-Merge-Branch-Trunk

-r, , , i. , , : , , , , , , , .

trunk svn, , , , , , .

+3

,

svn resolve --accept working -R <file name with path>
+3

More articles:


All Articles