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

On Wed, May 17, 2023 at 9:44 AM Rick Macklem <rick.macklem@gmail.com> 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".)
>
> Thanks for any help with this, rick

After a cherry-pick that doesn't give you quite what you want, edit
the file until it has the correct contents, then do "git commit
--amend /path/to/file".