Cherry Picking
- If feature branch has multiple commits and you want to apply a particular commit on master, then you can cherry pick the particular commit from feature branch and apply it on top of master
git switch master
git cherry-pick commitid
- if there are conflicts
git mergetool
git commit