what do I do when git cherry-pick works, but results are bogus?

[Rick Macklem]

So, the subject line basically says it.
I do a git cherry-pick to MFC. It works, but the resultant file(s) are not
correct. What do I do to fix this?
(If the merge fails, then it's easy, but there doesn't seem to be an option
 on cherry-pick that forces it into "merge failed", so you can edit/add the file
 and then "git cherry-pick --continue".)

Thanks for any help with this, rick