经常需要从一个分支选择性的合并commit到另一个分支,具体可使用cherry-pick实现:
1.单个commit合并

git cherry-pick commit_id


2.多个连续commit合并
commit_id到commit_idn之间,包括两端

git cherry-pick commit_id..commit_idn


commit_id到commit_idn之间,非闭包
git cherry-pick (commit_id..commit_idn]
挑选多个commit:

git cherry-pick commit_id commit_idx commit_idy


3.合并过程中依次解决冲突后,继续合并
git cherry-pick --continue