Cherry picking instead of merges.

[David Brown <git@davidb.org>]

We have a branch coming from "company B" who is also doing development on
the same tree as us.  We would like to do regular merges with them, but
unfortunately, there are quite a few changes in between.

First we tried a git-merge and resolved the conflicts.  The problem here is
that the resultant code didn't work.  git-bisect wasn't very useful because
the intermediate versions don't have resolved conflicts.

Yesterday, one developer cherry picked company B's changes into a branch.
It appears he resolved the conflicts for each commit, which should make
bisecting easier.

The problem is that we now have very divergent history.

Any advice on how to make use of how he resolved conflicts in order to
merge company B's changes in using git-merge.  I could always use the
"ours" strategy to just kind of force the merge, so at least future merges
would work, but it'd kind of be nice to have the proper history.

There are about 110 commits in question.

Thanks,
David Brown