重新整合工作流程 [英] reintegrate workflow

问题描述

你好专家，

我的一个简单问题，我是 Tortoise SVN 的老新手.

A simple question from me, an old newbie to Tortoise SVN.

我在一个分支上工作，现在想将我分支中的更改(提交后)合并到主干.但是我不确定正确的工作流程.在解决所有可能的冲突后，我是否应该首先将主干合并到我的工作副本，然后将我的分支重新集成到主干?由于我的大部分同事都在放假，我无法在我的团队中获得有关此类基础知识的任何建议.

I'm working on a branch, and want now to merge the changes in my branch (after commit) to the trunk. However I'm not sure about the correct workflow. Should I first merge the trunk to my working copy, after resolving all the possible conflicts, then reintegrate my branch to the trunk? Since most of my colleague are still in holidays, I cannot get any advices on such basics in my team.

非常感谢，

约翰在慕尼黑

推荐答案

是.

鉴于你已经说了这么多，不知道还有什么要补充的:)

Not sure what else to add given that you said it all :)

值得注意的是，重新集成功能基本上会使您的分支对进一步开发毫无用处，因此它必须是有史以来的最后一步，就在分支删除之前，因此请尽量避免，直到您完全确定代码已准备好生产.如果不确定，您可以从分支到主干进行定期合并.为什么这个功能会存在是我一直无法理解的事情；我想这是 Subversion 糟糕的合并跟踪的副作用.

It's worth noting that the reintegrate feature basically makes your branch useless for further development so it must be the last step ever, right before branch deletion, so try to avoid until you're fully sure that the code is production ready. If unsure, you can do a regular merge from branch to trunk. Why the feature even exists is something that I've never been able to grasp; I suppose it's a side effect of Subversion's poor merge tracking.

我还建议您不要一次执行所有合并，而是尝试将它们分成更小的集合并在合并之间提交您的工作.如果您遇到合并冲突，则无法轻松修复并希望能够恢复.

I also suggest you don't perform all merges at once and, instead, try to divide them into smaller sets and commit your work between merges. If you get a merge conflict you can't easily fix you want to be able to revert.

更新:官方Subversion版本控制书籍是这样说的:

在 Subversion 1.5 中，一次--reintegrate 合并是从分支到主干完成的，分支是没有的更长时间用于进一步的工作.它是无法正确吸收新躯干更改，也不能正确再次重新集成到后备箱.为了这原因，如果你想继续工作您的功能分支，我们推荐销毁它然后重新创建它从后备箱

In Subversion 1.5, once a --reintegrate merge is done from branch to trunk, the branch is no longer usable for further work. It's not able to correctly absorb new trunk changes, nor can it be properly reintegrated to trunk again. For this reason, if you want to keep working on your feature branch, we recommend destroying it and then re-creating it from the trunk

http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html#svn.branchemerge.basicmerging.reintegrate

这篇关于重新整合工作流程的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！