I made some changes in my master branch and want to bring those upstream. when I cherry-pick the following commits however I get stuck on fd9f578 where git says:I made some changes in my master branch and wan
阅读背景：
git cherry-pick说:“……38c74d是一个合并，但是没有-m选项。”
来源：互联网
分享到：
