[Git] Cherry pick

For example we have:

• develop branch
• hotfix branch
• release branch

'develop' branch has all the latest commits and features; 'release' branch is far behand 'develop' branch.

Now we found a bug which is important to fix it now in our production.

'hotfix' based on 'develop' branch, contains all new features so we cannot just merge 'hotfix' branch into 'release' branch, otherwise, some new & untested features lack into production.

 

What we can do is using 'cherry-pick':

1. we can find all the commit id which releated to 'hotfix'

Then apply cherry-pick to our release branch:

git checkout release
git cherry-pick <commit-id>

 

It ensures we only get the changes we did for hotfix, not anything else we didn't touch.