SVN - 将分支合并到主干，覆盖一些主干更改/新功能
所以......我有一个问题，我创建了一个分支（0.1）并在那里修复了一些东西，但同时我正在主干中处理新的东西。
现在我想将分支（0.1）合并到主干，在提交之前我做了 diff，我发现应该从主干而不是分支使用一些更改（例如新的 URL 和新的函数名称），但没有报告冲突。
我该如何处理？我应该进行反向合并吗？ -> trunk 到新分支的副本（例如：0.1-TEST），然后将新分支（0.1-TEST）合并回 trunk？
So... I have a problem where I created a branch (0.1) and fixed a few things there, but meanwhile I was working on new things in trunk.
Now I want to merge branch (0.1) to trunk and before commit I did diff and I saw that some changes should be used from trunk not branch (new URLs and new function names for example) but there was no conflict reported.
How do I deal with that? Should I do the reverse merge? -> trunk to the copy of new branch (for example: 0.1-TEST) and then merge new branch (0.1-TEST) back to trunk?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
您应该始终从主干中获取更改并将它们合并到您的分支中。这样您的分支机构始终尽可能保持最新状态。话虽如此，如果您在第一次合并时没有遇到冲突，那么再次进行合并时您很可能不会遇到任何冲突。我知道这很糟糕，但您可能必须手动查找并删除分支中您不希望在主干中进行的更改。
You should always be taking changes from the trunk and merging them into your branch. That way your branch is always as up to date as possible. Having said that if you didn't get conflicts with the first merge, odds are doing it again you are not going to get any conflicts. I know it sucks but you're probably going to have to manually look and remove the changes from the branch that you didn't want in the trunk.