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

In reply to: Rick Macklem : "what do I do when git cherry-pick works, but results are bogus?"
Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Pat Maddox <pat_at_patmaddox.com>
Date: Sat, 20 May 2023 03:19:43 UTC

On Wed, May 17, 2023, at 9:44 AM, Rick Macklem wrote:
> 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".)

git cherry-pick --no-commit

?