SVN - 重新整合合并错误:“必须是祖先相关的"； [英] SVN - Reintegration Merge error: "must be ancestrally related"

问题描述

使用 TortoiseSVN - 当我使用测试合并时，出现错误http://mysvnserver/svn/main/branches/ProjectA 必须与 http://mysvnserver/svn/main/trunk 有血缘关系/ProjectB"

Using TortoiseSVN - when I use Test Merge, I get the error "http://mysvnserver/svn/main/branches/ProjectA must be ancestrally related to http://mysvnserver/svn/main/trunk/ProjectB"

我该怎么做才能解决这个问题?

What can I do to resolve this?

推荐答案

我刚刚遇到了一个类似的问题，想添加我遇到的问题和解决方案.分支是由树干的子文件夹而不是整棵树制成的.因此，当我试图重新整合时，我的等级制度不匹配.只需将集成重组到我的主干 WD 的正确子文件夹中即可继续进行.

I just went through a similar problem, wanted to add the issue and solution I hit. The branch was made from a SUBFOLDER of trunk and not the entire tree. Thus, when I tried to reintegrate, I was mismatching hierarchies. Simply restructuring the integrate to be to the proper subfolder of my trunk WD allowed the process to proceed.

添加希望这可能会帮助遇到此问题的人.:)

Adding in hopes this might aid someone who hits this Q/A. :)

这篇关于SVN - 重新整合合并错误:“必须是祖先相关的"；的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！