SVN合并与树冲突问题
我在这个网站上看到过其他帖子的答案，但我认为我的情况略有不同。我的情况如下：
- 主干和分支b1
- 在某个点上，b1被“复制”到主干，因为主干是多余的，并且分支具有所有相关功能开发
- 在b1上继续，而主干但部分主干开发涉及将一些文件移动到不同的b1 上也存在的位置
- ，所以现在我尝试将 b1 合并到主干，它抱怨树冲突，我理解这一点 - 由于主干上的移动，主干上的文件丢失。
有些帖子表明这是 SVN 1.5 问题，但我确信我已将存储库升级到 1.6+。我如何确认这一点？此外，如何解决树冲突问题。
我正在使用 TortoiseSVN v1.6.8。
I have seen other posts on this site with answers, but I think I have a slightly different scenario. My situation is as follows:
- trunk and branch b1
- at a certain point, b1 was 'copied' to trunk as trunk was redundant and branch had all relevant functionality
- dev continued on b1, and trunk but part of trunks dev involved moving some files to different locations that also exist on b1
- so now I try to merge b1 to trunk and it complains about tree conflicts, which I understand - files missing on trunk because of the moves on trunk.
Some posts suggest this is a SVN 1.5 issue, but I'm sure I've upgraded the repos to 1.6+. How do I confirm this? And furthermore, how do I fix the tree conflict issue.
I'm using TortoiseSVN v1.6.8.
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
阅读 SVN 书籍。
归结为：当您创建分支时，可能有两种合并场景：“追赶”和“重新集成”。
追赶合并是指将更改从主干拉到分支中。您可以（并且应该）经常这样做，以确保您的分支不会与主干偏离太多。
重新集成分支是将分支合并回主干时发生的情况。由于颠覆跟踪合并和更改的方式，此后分支将被视为损坏。如果您需要继续在该分支中工作，Subversion 书籍建议您在重新集成合并后立即删除该分支，然后从合并的主干重新创建它。
Read the SVN book.
It boils down to this: When you create a branch, there can be two merge scenarios, 'catch-up' and 'reintegrate'.
A catch-up merge is when you pull changes from the trunk into your branch. You can (and should) do this a lot, to make sure your branch doesn't diverge from the trunk too much.
A reintegrate branch is what happens when you merge a branch back into the trunk. Because the way subversion tracks merges and changes, the branch is to be considered corrupt after this. If you need to continue working in that branch, the subversion book recommends you delete the branch right after the reintegrate merge and then re-create it from the merged trunk.