Typorithm · medium

cherry-pick

git-cherry-pickgitcherry-pickcommitapply

Saved on this device

Full lesson · 8 learning steps Open any exercise for focused practice

Step 1 of 8 · intro card

Learn cherry-pick

Advanced

git cherry-pick applies a specific commit from elsewhere onto the current branch as a new commit. A conflict pauses it — resolve then --continue, or --abort to back out. -n applies without committing so you can combine several. It is the standard way to backport a fix.

git cherry-pick a1b2c3d takes the change introduced by one commit — anywhere in the repo — and replays it on top of your current branch as a brand-new commit with a new hash. It is the go-to tool for backporting a single fix to a release branch.

If the replay conflicts, cherry-pick stops and waits. After you resolve and stage the files, git cherry-pick --continue completes it; git cherry-pick --abort cancels the whole operation and restores the branch to where it started.

git cherry-pick -n (--no-commit) applies the change to the working tree and index but stops short of committing, so you can pick several commits and bundle them into one. git log --oneline -5 then confirms the result.

cherry-pick replays one commit as a new commit.

Conflicts pause it: --continue or --abort.

-n applies without committing so you can combine picks.

git cherry-pick a1b2c3d
git cherry-pick --continue
git cherry-pick --abort
git cherry-pick -n a1b2c3d
git log --oneline -5

Read the implementation

Connect each part of the code to the concept before you type.

1. Apply a commit

cherry-pick replays one specific commit onto the current branch as a new commit.

git cherry-pick a1b2c3d

2. Resume after conflict

--continue finishes the cherry-pick once you have resolved the paused conflict.

git cherry-pick --continue

3. Back out

--abort cancels the cherry-pick and restores the branch to its prior state.

git cherry-pick --abort

4. No commit

-n (--no-commit) applies the change to the working tree without committing it.

git cherry-pick -n a1b2c3d

5. Inspect history

log --oneline -5 shows the last five commits so you can confirm the pick landed.

git log --oneline -5

A complete learning loop

Understand

Read the concept map and follow the code breakdown.

Reconstruct

Type the implementation, repair mistakes and work through every recall exercise.

Verify

Use the final check without hints; revisit weak concepts in short practice sessions.