svn 尝试将更改从主干合并到分支
我们有一个分支 Branch1,然后我们再次分支出 Branch1A。 一直以来,我们一直将主干更改合并到 Branch1,然后将 Branch1 的更改合并到 Branch1A,
然后将 Branch1 重新与主干集成。现在我们想要将这些更改和任何其他主干更改合并到 Branch1A 中。
但是,当我尝试进行此合并时,我遇到了数百个树冲突?
我做错了什么?
We had a branch Branch1 that we then branched off again, Branch1A.
All the while we've been merging trunk changes into Branch1 and then merging change from Branch1 into Branch1A
Branch1 was then re-integrated with trunk. And now we want to merge those changes and any other trunk changes into Branch1A.
However when I try to do this merge, I get hundreds of tree conflicts?
What have I done wrong?
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(1)
我认为树冲突是由“重复合并”引起的(SVN认为是对的)
I think the Tree conflicts are caused by "repeating merge"(SVN think it's right)