Cherry-Pick
📌 Covered in this chapter:
Selecting a Single Commit · Cherry-Pick Conflicts · Duplicate History Risks
Apply a single specific commit from one branch onto another using git cherry-pick, without merging the entire branch.
1Cherry-Pick — What You'll Learn
Apply a single specific commit from one branch onto another using git cherry-pick, without merging the entire branch.
Here's everything this chapter covers, in the order you'll learn it:
- What cherry-pick does
- Selecting one specific commit to apply elsewhere
- A common use case: applying a bug fix to another branch
- Handling cherry-pick conflicts
- Continuing after resolving a conflict
- Aborting a cherry-pick
- Cherry-picking multiple commits
- When cherry-pick is the right tool
- The risk of duplicate commits in history
2Working Example
💻 Example: Cherry-Pick
Bash
git cherry-pick 3Best Practices & Common Pitfalls
💡 Key things to remember:
- Cherry-pick creates a NEW commit with the same changes but a different hash — use it sparingly, since overusing it can make history confusing and lead to the same fix appearing 'twice' in different branches.
❓ Frequently Asked Questions (FAQ)
Q What's the most important thing to understand about cherry-pick?
Focus on: Selecting a Single Commit · Cherry-Pick Conflicts · Duplicate History Risks. These are the core building blocks this chapter's examples are built around, and they show up repeatedly in later chapters of this course.
Q Is cherry-pick something I'll use often in real projects?
Yes — every concept in this chapter reflects a real, everyday part of professional Git and GitHub workflows, not just a theoretical exercise.