From: Alex Riesen <raa.lkml@gmail.com>
Date: Thu, 03 Jul 2008 20:13:54 GMT
Subject: Re: Cherry picking instead of merges.
Message-ID: <20080703201354.GA3546@steel.home>
In-Reply-To: <20080703182650.GA11166@old.davidb.org>

David Brown, Thu, Jul 03, 2008 20:26:50 +0200:
> 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.

...and have absolutely no idea on what were the changes of the company
B were made.

> Any advice on how to make use of how he resolved conflicts in order to
> merge company B's changes in using git-merge. ...

Let that developer do the merge next time? Or let the B do a merge
with a commonly accepted base?