Haven't I seen you before?
Catch the train.
Pick what you want.
More advanced merge base tricks.
Advanced merge base tricks.
Making sure you have the correct merge base.
Recursive merging for fun and profit.
Move the cherry-pick into the merge base so that git knows it exists in both sides.
You wish you got a merge conflict, but you didn't.
Setting the pieces into motion.