2
我有一個svn倉庫,我搞砸了一個合併 - 不幸的是,我沒有意識到這一點,並且自那時起對倉庫進行了其他更改。這裏的情況Subversion合併的困境
r100 - Created Branch r101 - Changes to Trunk r102 - Changes to Trunk r103 - Change to branch r104 - Change to branch r105 - Re-Integrate Branch (Forgot to merge trunk changes into branch here) r106 - Change to trunk r107 - Revert trunk to r102 r108 - Merge trunk changes into Branch r109 - Re-Integrate Branch
一個抽象的快照如何從
R108 R106
回主幹重新申請變更?
編輯:爲了澄清,我已重新集成分支回樹幹,但我需要重新應用第一次合併後對樹幹所做的更改。
對於我來說問題並不清楚。 –