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

On Wed, 17 May 2023, 17:44 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-pi

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 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 cher

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

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 t