How to merge a branch into another
git merge (commit with multiple parents) of the target and branch tips
apply the commits as a patch
See Implementation
How to merge a branch into another