Date: Wed, 17 May 2023 17:41:33 +0000 (UTC) From: Matt Wheeler <m@funkyhat.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: <CAG93HwGLZF0TTaNE3i2sNVKvKxSovHPeYM5w9SygJC%2BPFJx0pA@mail.gmail.com> In-Reply-To: <CAM5tNy4dhJr=gTsTB7DYN9TXqa6TVA1pW9bF=h9sX32zEfwNTA@mail.gmail.com> References: <CAM5tNy4dhJr=gTsTB7DYN9TXqa6TVA1pW9bF=h9sX32zEfwNTA@mail.gmail.com>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On Wed, 17 May 2023, 17:44 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".) > If you're cherry-picking multiple commits then you can turn the problem into a rebase After the cherry-pick commits are created, then run git rebase -i <ref your branch is based on> Then change the `i` at the start of the line for the broken commit to `e` (edit) before saving the plan file [-- Attachment #2 --] <div dir="auto"><div><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, 17 May 2023, 17:44 Rick Macklem, <<a href="mailto:rick.macklem@gmail.com">rick.macklem@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">So, the subject line basically says it.<br> I do a git cherry-pick to MFC. It works, but the resultant file(s) are not<br> correct. What do I do to fix this?<br> (If the merge fails, then it's easy, but there doesn't seem to be an option<br> on cherry-pick that forces it into "merge failed", so you can edit/add the file<br> and then "git cherry-pick --continue".)<br></blockquote></div></div><div dir="auto"><br></div><div dir="auto">If you're cherry-picking multiple commits then you can turn the problem into a rebase </div><div dir="auto"><br></div><div dir="auto">After the cherry-pick commits are created, then run </div><div dir="auto"><br></div><div dir="auto"> git rebase -i <ref your branch is based on></div><div dir="auto"><br></div><div dir="auto">Then change the `i` at the start of the line for the broken commit to `e` (edit) before saving the plan file </div><div dir="auto"><br></div><div dir="auto"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> </blockquote></div></div></div>help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAG93HwGLZF0TTaNE3i2sNVKvKxSovHPeYM5w9SygJC%2BPFJx0pA>