svn：除主干之外的分支之间的合并
我们有一个 SVN 项目，其中有我工作的分支 B 和同事工作的分支 C。 （他主要在一个代码区域工作，而我主要在另一个区域工作）
如果我们希望在对主干进行任何合并之前保持同步，他和我应该如何合并？
我们在合并内容时没有任何问题，但是内容（特别是 svn:mergeinfo，出于明显的原因）不断显示树冲突并且总是给我们带来麻烦。
我们应该做什么？
We have a SVN project with branch B that I work on, and branch C, that a coworker works on. (he works primarily on one area of code and I work primarily on another)
How are he and I supposed to merge, if we wish to stay in sync prior to doing any merges to the trunk?
We don't have any problems merging content, but the content (particularly svn:mergeinfo, for obvious reasons) keeps displaying tree conflicts and always gives us trouble.
What should we do?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
如果你们可以在同一个分支中工作，那么请考虑对一个分支进行所有更改的无根据合并，并放弃另一个分支。如果您的分支中有其他必须保持独立的更改，那么请仔细考虑仅挑选那些应该毫无根据地合并到单个分支的更改，然后在源分支中恢复这些更改。
结构（供参考）:
流程将类似于以下内容：
IDEA：如果可能的话，避免将来必须在子分支之间共享不稳定的更改。毫无根据的合并和选择性更改都是比标准的完整父子合并风险更高的操作。一种方法是使用公共开发分支，然后仅在需要时按功能进行分支。所有开发人员都使用公共开发分支进行更改。当重大变更需要多个开发人员来构建和稳定时，创建功能分支。一旦稳定，集成回开发分支并退出功能分支。
If you can both work in the same branch then consider doing a baseless merge of all changes to one branch and abandon the other branch. If you have other changes in your branch that must remain separate then CAREFULLY consider cherry-picking just the changes that should be baseless merged to single branch, then revert those changes in the source branch.
Structure (for reference):
Process would be something like the following:
IDEA: If possible avoid having to share unstabilized changes between child branches in the future. Baseless merges and cherry-picking changes are both higher risk operations than standard full parent-child merges. One apprach is to use a common Development branch, then branch by feature only when needed. All developers use the common dev branch for changes. When breaking change needs multiple developers to build&stabilize create the feature branch. Once stabilized integrate back to Dev branch and retire the feature branch.