Date: Mon, 14 Aug 2023 11:22:09 -0600 From: Warner Losh <imp@bsdimp.com> To: Graham Perrin <grahamperrin@gmail.com> Cc: freebsd-git <freebsd-git@freebsd.org> Subject: Re: Resolve merge conflicts Message-ID: <CANCZdfrKkvmjfB3LGxctV6HtEQNsDXnsuKYsno_gBti_kZHqkw@mail.gmail.com> In-Reply-To: <f2a930cd-eae8-cb28-9e94-7d5fa7801a31@gmail.com> References: <e25f395a-825f-aaa4-fb86-d2fcc78a31d5@gmail.com> <f2a930cd-eae8-cb28-9e94-7d5fa7801a31@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--0000000000000a7b890602e54ede Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Aug 14, 2023 at 11:15=E2=80=AFAM Graham Perrin <grahamperrin@gmail.= com> wrote: > On 14/08/2023 18:03, Graham Perrin wrote: > > Re: <https://github.com/grahamperrin/freebsd-doc/tree/commercial>; > <https://github.com/grahamperrin/freebsd-doc/tree/commercial>; I need to > resolve merge conflicts. Visually: > > <https://i.imgur.com/6eZo8pP.png>; <https://i.imgur.com/6eZo8pP.png>; > > =E2=80=A6 You can resolve merge conflicts using the command line and a te= xt > editor. =E2=80=A6 > > It's so long since I did this, my mind is nearly blank. > > The conflicts no longer exist. > > Maybe some lag with GitHub, even after a refresh of the page (the > screenshot above was taken around eleven minutes after a merge without > conflict) > Generally, I do a 'git rebase -i main $BRANCH' and then hop into emacs to see if I can work out the three way merge detritus to see what I need to add. Not the greatest instructions, I know, but they often have been enough for others to make progress. Warner --0000000000000a7b890602e54ede Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr"><div dir=3D"ltr"><br></div><br><div class=3D"gmail_quote">= <div dir=3D"ltr" class=3D"gmail_attr">On Mon, Aug 14, 2023 at 11:15=E2=80= =AFAM Graham Perrin <<a href=3D"mailto:grahamperrin@gmail.com">grahamper= rin@gmail.com</a>> wrote:<br></div><blockquote class=3D"gmail_quote" sty= le=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);paddi= ng-left:1ex"> =20 =20 =20 <div style=3D"padding-bottom:1px"> <p>On 14/08/2023 18:03, Graham Perrin wrote:<br> </p> <blockquote type=3D"cite"> <p>Re: <a href=3D"https://github.com/grahamperrin/freebsd-doc/tree/co= mmercial" target=3D"_blank"><https://github.com/grahamperrin/freebsd-doc= /tree/commercial></a> I need to resolve merge conflicts. Visually: <br> </p> <p><a href=3D"https://i.imgur.com/6eZo8pP.png" target=3D"_blank"><= https://i.imgur.com/6eZo8pP.png></a></p>; <p> </p> <blockquote type=3D"cite">=E2=80=A6 You can resolve merge conflicts u= sing the command line and a text editor. =E2=80=A6</blockquote> <p>It's so long since I did this, my mind is nearly blank. </p> </blockquote> <p>The conflicts no longer exist. <br> </p> <p>Maybe some lag with GitHub, even after a refresh of the page (the screenshot above was taken around eleven minutes after a merge without conflict)<br></p></div></blockquote><div><br></div><div>Gener= ally, I do a 'git rebase -i main $BRANCH' and then hop into emacs t= o see if I can work out the three way merge detritus to see what I need to = add.</div><div>Not the greatest instructions, I know, but they often have b= een enough for others to make progress.</div><div><br></div><div>Warner</di= v></div></div> --0000000000000a7b890602e54ede--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfrKkvmjfB3LGxctV6HtEQNsDXnsuKYsno_gBti_kZHqkw>