谁能帮我解决 cherry-pick Git 错误？
Who can help me in fixing the cherry-pick Git error?
fiqri@fiqri-X441UA:~/android_kernel_xiaomi_vince-4.9$ git cherry-pick 89a3491a2092de1d672644b273fcdfea46604319
error: commit 89a3491a2092de1d672644b273fcdfea46604319 is a merge but no -m option was given.
fatal: cherry-pick failed
来自https://git-scm.com/docs/git-cherry-pick
-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。在这种情况下，您需要指定 parent-number。
fiqri@fiqri-X441UA:~/android_kernel_xiaomi_vince-4.9$ git cherry-pick 89a3491a2092de1d672644b273fcdfea46604319
error: commit 89a3491a2092de1d672644b273fcdfea46604319 is a merge but no -m option was given.
fatal: cherry-pick failed
来自https://git-scm.com/docs/git-cherry-pick
-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。在这种情况下，您需要指定 parent-number。