在大型DVCS重新启动操作中，多人如何为解决冲突做出贡献？ [英] How can multiple people contribute to resolving conflicts during a large DVCS rebase operation?

问题描述

一个非常长寿的话题分支的重组可能会非常痛苦，并且需要几个小时或几天的工作时间。第二位（或第三位）人员如何为重新配售工作做出贡献？是否有一些工具可以找到两个人可以独立工作的独立冲突？ 解决方案

打开rerere

  git config --global rerere.enabled 1 
 git config --global rerere.autoupdate true 
  

每当您解决冲突时，分辨率都会被记录下来。现在你必须分享它：

设置一个到 .git / rr-cache 目录的符号链接。将其初始化为存储库。让其他开发人员这样做。

现在您可以通过此解决方案资源库在团队中分享解决方案。

这里有更多关于rerere的信息： http://progit.org/2010/03/08/ rerere.html

您也可能会重新考虑您的重组策略。合并对于某些情况是一个更好的选择。

希望这有助于。

A rebase of a very long-lived topic branch can be quite painful and take hours or days of work for one person. How can a second (or third) person contribute to the rebasing effort? Is there some tool that can find independent conflicts that two people could work on independently?

解决方案

turn on rerere

git config --global rerere.enabled 1
git config --global rerere.autoupdate true

whenever you resolve a conflict, the resolution will be recorded. Now you have to share it:

Set up a symlink to the .git/rr-cache directory. Initialize that as a repository. Have the other devs do that.

Now you can share the resolutions across the team via this resolution repository.

here is more on rerere: http://progit.org/2010/03/08/rerere.html

You may also rethink your strategy of rebasing. Merging is a better option for certain situations.

Hope this helps.

这篇关于在大型DVCS重新启动操作中，多人如何为解决冲突做出贡献？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！