SVN：将旧分支合并到新分支
在 SVN 存储库中，我有一个旧分支（我们称之为分支 1），它现在与主干不同步大约 2 个月，我现在需要创建一个新分支（分支 2）来扩展分支 1 的功能。
很可能会出现冲突和合并文件，并且由于所花费的时间/工作量，我可以想象自动合并不会完美无缺，或者也许我应该更有信心。
不管怎样，我想知道是否有人可以提供任何有用的指示，告诉我如何处理这种情况，以及我应该注意哪些事情，或者这只是简单地手动进行整个合并的情况？
感谢您的任何建议！
Within an SVN repo, I have an old branch (lets call it branch1) which is now about 2 months out of sync from trunk, and I now need to create a new branch (branch2) to extend the functionality of branch1.
It's very likely there are going to be conflicts and merged files, and due to the amount of time/work passed, I can imagine that an automatic merge is not going to be flawless, or maybe I should just have more faith.
Either way, I was wondering if anybody could provide any useful pointers for how I might tackle this scenario, and what sort of things I should watch out for, or will this simply be a case of simply doing the entire merge manually?
Thanks for any advice!
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
一般来说，我会运行所有自动化测试以确保一切正常。然后，我复制分支和主干（例如复制/粘贴最新的本地存储库）。然后尝试自动合并。之后，我重新运行所有自动化的单元、集成和功能测试。如果有任何事情看起来很糟糕，我会恢复到原始版本并手动进行处理。通常，如果你有一个可怕的自动合并，它甚至无法编译，更不用说通过测试了。通常，我决定根据具体情况进行恢复，评估此时哪一个看起来更省时（即手动重新合并一些损坏的文件，或重做整个小猫堆）。
Generally, I run all my automated tests to ensure all is good. I then make a copy of the branches and trunk (e.g. copy/paste an up to date local repo). Then attempt an auto merge. Afterwords I rerun all the unit, integration and functional tests that are automated. If any thing is off that looks bad, I revert to original version and go at it by hand. Usually, if you got a horrible auto merge it won't even compile, let alone pass tests. Normally I decide to revert on a case by case basis assessing which ever looks less time consuming at that point (i.e. manually re-merge a few busted files, or redo the whole kitten caboodle).