Java开发网 - 用subversion在做rebase是的疑问？

Java开发网

您没有登录

» Java开发网 » Design Pattern & UML

打印话题 寄给朋友 订阅主题

作者

用subversion在做rebase是的疑问？

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.

话题树型展开

人气	标题	作者	字数	发贴时间
13055	用subversion在做rebase是的疑问？	dissip	959	2006-03-13 19:58
9998	Re:用subversion在做rebase是的疑问？	floater	1226	2006-03-26 11:58
10153	Re:用subversion在做rebase是的疑问？	dissip	616	2006-03-27 16:52
11623	Re:用subversion在做rebase是的疑问？	floater	82	2006-03-28 00:16

已读帖子

新的帖子

被删除的帖子