Stop cherry-picking, start merging, Part 5: Exploiting the three-way merge
Making sure you have the correct merge base.
Making sure you have the correct merge base.
Recursive merging for fun and profit.
They all say "pack" for one reason or another.
You wish you got a merge conflict, but you didn't.
Setting the pieces into motion.