Git cherry-pick syntax and merge branches

后端 未结 6 1196
梦毁少年i
梦毁少年i 2020-12-12 19:05

So I have done countless cherry picks before and it seems that I must fail at life with this right now, I am trying to cherry pick from one branch to another which should be

6条回答
  •  情歌与酒
    2020-12-12 19:31

    parent1 commit change widget

    parent2 commit change clutter

    merge commit (contains both changes) widget clutter

    git cherry-pick -m 1 merge-commit (parent1) diff of merge and parent2 merge - parent2 = widget

    git cherry-pick -m 2 merge-commit (parent1) diff of merge and parent1 merge - parent1 = clutter

提交回复
热议问题