What is git cherry-pick? According to the official git documentation, the goal of a cherry-pick is to “ apply the changes introduced by some existing commit.” Essentially, a cherry-pick will look at a ...

Consider git cherry-pick. It lets you take a given commit — any commit, from any branch — and apply it to a different branch, without having to apply any other changes from the history of that ...

And, if those changes are in specific commits that contain nothing else, cherry-pick / rebase* are your friend. And if you run into those merge conflicts mentioned above, git rerere is your friend.