How can multiple people contribute to resolving conflicts during a large DVCS rebase operation?

问题

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?

回答1:

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.

来源：https://stackoverflow.com/questions/5410800/how-can-multiple-people-contribute-to-resolving-conflicts-during-a-large-dvcs-re