| 27 | Cherry-Picking Commits |
You sometimes need to grab one commit from another branch and merge
it into your local branch, such as a bug fix that needs to be
backported. You can grab commits one at a time using
git cherry-pick.
Cherry-picking a commit from another takes that single commit and commits it to your local branch. It’s pretty straightforward and appears extremely useful in a lot of situations, but be careful.
Cherry-picked commits have different commit IDs than the original commit they came from because their parent changed—remember that a commit ID is based partially on where it exists in the history, and changing the parent changes the commit ID. A good rule of thumb is to cherry-pick commits only when a merge is not an option, ...