Introduction: Cherry-Picking and Three-Way Merges

You may or may not remember that you covered the git cherry-pick command previously. At the time, I skated over some detail that I think you’re ready for now.

In this chapter, you will cover:

• The git cherry-pick command (again)
• Why cherry-pick might not do what you expect
• The git diff-tree and git apply commands
• What a “three-way merge” is

By the end, you’ll understand the cherry-pick command much more clearly and why and how you can get more surgical with your application of diffs from individual commits.