20 Cherry-pick exactly what you need

20 / 33

Goal

Bring just the two bug fixes from spike onto main, in order.

The spike branch was an experiment that won't be merged. But along the way you fixed two real bugs, and main needs them.

git cherry-pick <commit> copies a single commit onto HEAD — same change, same message, new hash. Give it several and it copies them in the order you list.

It's the precision tool: perfect for moving a fix between branches, or rescuing the good parts of an abandoned one.

Try it

Cherry-pick the date fix and the timezone fix onto main, and leave the rest behind.

Go to the terminal

Hint

git cherry-pick takes several commits at once. The fixes are the second and fourth commits on spike.

Show a solution

git log --oneline spike
git cherry-pick <hash> <hash>

This interactive environment needs JavaScript. Everything you need to read is on this page, and the solution works the same way for real.

Git

Starting Git…