dissip
BigCat
发贴: 240
积分: 60
|
于 2006-03-13 19:58
如图所示: create branch (@2)from trunk(@1) rebase from trunk to branch 2 times(from@3 to @5 and from @6 to @8) finally when i want to merge the change from branch(@9 ) to trunk (@10) how to do it in subversion.
it seems because subversion treat branch as copy, rebasing will always cause collision when finally try to merge branch to trunk. Is that true? any better solutions than just merge and solve conflict for all files?
trunk 1-------->3------->6---10 |cp |rb |rb ^ v v v |merge branch 2-->4-->5->7-->8-->9
dissip edited on 2006-03-13 20:04
To live is to fight.
|