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
whenever you resolve a conflict, the resolution will be recorded. Now you have to share it:
Set up a symlink to the
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.