Date: Wed, 17 May 2023 09:49:32 -0700 From: Alan Somers <asomers@freebsd.org> To: Rick Macklem <rick.macklem@gmail.com> Cc: FreeBSD CURRENT <freebsd-current@freebsd.org> Subject: Re: what do I do when git cherry-pick works, but results are bogus? Message-ID: <CAOtMX2ikMLDD9wLvrE0_MXtoyiuxwC_dOwrSXuxAG-RQhP7fVQ@mail.gmail.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=E2=80=AFAM Rick Macklem <rick.macklem@gmail.co= m> wrote: > > So, the subject line basically says it. > I do a git cherry-pick to MFC. It works, but the resultant file(s) are no= t > correct. What do I do to fix this? > (If the merge fails, then it's easy, but there doesn't seem to be an opti= on > on cherry-pick that forces it into "merge failed", so you can edit/add t= he 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".
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAOtMX2ikMLDD9wLvrE0_MXtoyiuxwC_dOwrSXuxAG-RQhP7fVQ>