cherry-pick 失败后怎么办