Date: Wed, 17 May 2023 09:44:11 -0700 From: Rick Macklem <rick.macklem@gmail.com> To: FreeBSD CURRENT <freebsd-current@freebsd.org> Subject: what do I do when git cherry-pick works, but results are bogus? Message-ID: <CAM5tNy4dhJr=gTsTB7DYN9TXqa6TVA1pW9bF=h9sX32zEfwNTA@mail.gmail.com>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAM5tNy4dhJr=gTsTB7DYN9TXqa6TVA1pW9bF=h9sX32zEfwNTA>