From: Samuel Tardieu <sam@rfc1149.net>
Date: Thu, 03 Jul 2008 21:18:40 GMT
Subject: Re: Cherry picking instead of merges.
Message-ID: <2008-07-03-23-18-40+trackit+sam@rfc1149.net>
In-Reply-To: <20080703205329.GA17923@old.davidb.org>

>>>>> "David" == David Brown <git@davidb.org> writes:

David> It's only sitting in a private developer's branch.  I want to
David> do the merge properly, but I'm just trying to figure out how to
David> get the conflict resolution out of his work.

Why don't you create a commit which has both your (A) and company B
branch head (B) as parent with the same content as the private
developer's branch (P) which contains the succesful merge?

Something like that: (totally untested)

% git checkout A
% git merge --no-commit -s ours B
% git checkout P .
% git commit -a