乌龟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.