烏龜SVN分支必須與主幹祖先相關

Question

將分支代碼合併到主幹時出現問題

應該怎麼做才能真正避免該問題？

Answer 1

從在我的評論中討論的documenation：

This form is called a '2-URL merge': 

svn merge SOURCE1[@REV1] SOURCE2[@REV2] [TARGET_WCPATH] 

You should use this merge variant only if the other variants do not 
apply to your situation, as this variant can be quite complex to 
master. 

Two source URLs are specified, identifying two trees on the same 
branch or on different branches. The trees are compared and the 
difference from SOURCE1@REV1 to SOURCE2@REV2 is applied to the 
working copy of the target branch at TARGET_WCPATH. The target 
branch may be the same as one or both sources, or different again. 
The three branches involved can be completely unrelated. 

TARGET_WCPATH is a working copy path; if omitted, '.' is generally 
assumed. The special cases noted above in the 'complete' merge form 
also apply here. 

SOURCE1 and/or SOURCE2 can also be specified as a working copy path, 
in which case the merge source URL is derived from the working copy.