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.
Cod you believe it?
Another other time zone anomalies.
They are both the same thing under the covers.
One of many equivalent formulations.
There are six possible ways of arranging them. Surely one of them must look good.