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>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On Mon, Aug 14, 2023 at 11:15 AM 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>; > > … You can resolve merge conflicts using the command line and a text > editor. … > > 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 [-- Attachment #2 --] <div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Aug 14, 2023 at 11:15 AM Graham Perrin <<a href="mailto:grahamperrin@gmail.com">grahamperrin@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> <div style="padding-bottom:1px"> <p>On 14/08/2023 18:03, Graham Perrin wrote:<br> </p> <blockquote type="cite"> <p>Re: <a href="https://github.com/grahamperrin/freebsd-doc/tree/commercial" target="_blank"><https://github.com/grahamperrin/freebsd-doc/tree/commercial></a>; I need to resolve merge conflicts. Visually: <br> </p> <p><a href="https://i.imgur.com/6eZo8pP.png" target="_blank"><https://i.imgur.com/6eZo8pP.png></a></p>; <p> </p> <blockquote type="cite">… You can resolve merge conflicts using the command line and a text editor. …</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>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.</div><div>Not the greatest instructions, I know, but they often have been enough for others to make progress.</div><div><br></div><div>Warner</div></div></div>help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfrKkvmjfB3LGxctV6HtEQNsDXnsuKYsno_gBti_kZHqkw>