Date: Fri, 19 May 2023 20:19:43 -0700 From: "Pat Maddox" <pat@patmaddox.com> To: freebsd-current@freebsd.org Subject: Re: what do I do when git cherry-pick works, but results are bogus? Message-ID: <2b26b6ec-54b2-46be-9ae0-157a839b76fd@app.fastmail.com> In-Reply-To: <CAM5tNy4dhJr=gTsTB7DYN9TXqa6TVA1pW9bF=h9sX32zEfwNTA@mail.gmail.com> References: <CAM5tNy4dhJr=gTsTB7DYN9TXqa6TVA1pW9bF=h9sX32zEfwNTA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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 ?
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?2b26b6ec-54b2-46be-9ae0-157a839b76fd>