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 ...

Reapply commits with git cherry-pick Many advanced git commands are useful only in narrowly specific circumstances, and safely ignored even by moderately advanced users.

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.