- the function of the git cherry-pick is to merge another local branch’s modification to your current branch:
git cherry-pick <commit id>
- if you meet some conflicts,you can use:
git mergetool
git cherry-pick <commit id>
git mergetool