git cherry-pick not working

后端 未结 5 912
滥情空心
滥情空心 2020-11-28 09:10

I\'m trying to cherry-pick a commit from master and get it into the current production branch. However, when I execute git cherry-pick , I just

5条回答
  •  难免孤独
    2020-11-28 09:28

    In my case this was driving me nuts, as it was quite obvious that the specific commit I wanted to cherry pick had not been merged into my current branch.

    It turns out someone had already cherry picked the commit a week prior. The changes, but not the specific SHA, were already in my current branch, and I had not noticed them.

    Check the file(s) that you're attempting to cherry pick. If they already have the changes, a version of the commit has already been cherry picked or added in another manner. There is thus no need to cherry pick it again.

提交回复
热议问题