Re: Cherry picking instead of merges.

quoted

quoted

quoted

quoted

"David" == David Brown [off-list ref] 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