>>>>> "David" == David Brown <git@xxxxxxxxxx> 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
