commit xxx is a merge but no -m option was given问题解决

-m parent-number
--mainline parent-number
Usually you cannot cherry-pick a merge because you do not know which side of the merge should be considered the mainline. 
This option specifies the parent number (starting from 1) of the mainline and allows cherry-pick to replay the change relative to the specified parent.

一般来说你不能cherry-pick一个合并提交，因为此时无法知道合并的分支中哪一个作为主线。此参数指定主线分支号，以便允许cherry-pick来基于指定的主线分支来重新应用代码更改。

 

所以 git cherry-pick -m 1 xxxxxxx 即可