Date: Mon, 14 Aug 2023 18:03:52 +0100 From: Graham Perrin <grahamperrin@gmail.com> To: freebsd-git <freebsd-git@freebsd.org> Subject: Resolve merge conflicts Message-ID: <e25f395a-825f-aaa4-fb86-d2fcc78a31d5@gmail.com>
next in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------z0zYsgm2j10b2mydxA6h7m9q Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Re: <https://github.com/grahamperrin/freebsd-doc/tree/commercial>; I need to resolve merge conflicts. Visually: <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. Can someone help? Thanks. My config: % git -C /usr/doc config --list | sort branch.13.2-RC4.merge=refs/heads/13.2-RC4 branch.13.2-RC4.remote=origin branch.13.2R.merge=refs/heads/13.2R branch.13.2R.remote=origin branch.2023q2.merge=refs/heads/2023q2 branch.2023q2.remote=origin branch.advocacy-myths.merge=refs/heads/advocacy-myths branch.advocacy-myths.remote=origin branch.beastie-theme-en.merge=refs/heads/beastie-theme-en branch.beastie-theme-en.remote=origin branch.bug-267176.merge=refs/heads/bug-267176 branch.bug-267176.remote=origin branch.bug-270229-gpl.merge=refs/heads/bug-270229-gpl branch.bug-270229-gpl.remote=origin branch.bug-270338.merge=refs/heads/bug-270338 branch.bug-270338.remote=origin branch.commercial.merge=refs/heads/commercial branch.commercial.remote=origin branch.d39560.merge=refs/heads/main branch.d39560.remote=origin branch.events.merge=refs/heads/events branch.events.remote=origin branch.main.merge=refs/heads/main branch.main.remote=origin branch.patch-1.merge=refs/heads/patch-1 branch.patch-1.remote=origin branch.patch-7.merge=refs/heads/patch-7 branch.patch-7.remote=origin branch.releng/12.4.merge=refs/heads/releng/12.4 branch.releng/12.4.remote=origin branch.status.merge=refs/heads/status branch.status.remote=origin core.bare=false core.filemode=true core.logallrefupdates=true core.repositoryformatversion=0 credential.helper=store --file /usr/doc/.git/.git-credentials remote.freebsd.fetch=+refs/heads/*:refs/remotes/freebsd/* remote.freebsd.fetch=+refs/notes/*:refs/notes/* remote.freebsd.pushurl=git@repo.freebsd.org:doc.git remote.freebsd.url=https://git.freebsd.org/doc.git remote.origin.fetch=+refs/heads/*:refs/remotes/origin/* remote.origin.gh-resolved=base remote.origin.url=https://github.com/grahamperrin/freebsd-doc.git remote.upstream.fetch=+refs/heads/main:refs/remotes/upstream/main remote.upstream.url=https://github.com/freebsd/freebsd-doc.git user.email=grahamperrin@FreeBSD.org user.name=Graham Perrin % There's a merge conflict aspect to <https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally>, however instructions there seem to be non-applicable. Also, merge conflicts are mentioned in the Committer's Guide, but (sorry) I'm not yet at a point where I can put this in context. --------------z0zYsgm2j10b2mydxA6h7m9q Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 8bit <html data-lt-installed="true"> <head> <meta http-equiv="content-type" content="text/html; charset=UTF-8"> </head> <body style="padding-bottom: 1px;"> <p>Re: <a class="moz-txt-link-rfc2396E" href="https://github.com/grahamperrin/freebsd-doc/tree/commercial"><https://github.com/grahamperrin/freebsd-doc/tree/commercial></a>; I need to resolve merge conflicts. Visually: <br> </p> <p><a class="moz-txt-link-rfc2396E" href="https://i.imgur.com/6eZo8pP.png"><https://i.imgur.com/6eZo8pP.png></a></p>; <p> <blockquote type="cite">… You can resolve merge conflicts using the command line and a text editor. …</blockquote> </p> <p>It's so long since I did this, my mind is nearly blank. Can someone help?<br> </p> <p>Thanks. My config: <br> </p> <p><span style="font-family:monospace"><span style="color:#000000;background-color:#ffffff;">% git -C /usr/doc config --list | sort </span><br> branch.13.2-RC4.merge=refs/heads/13.2-RC4 <br> branch.13.2-RC4.remote=origin <br> branch.13.2R.merge=refs/heads/13.2R <br> branch.13.2R.remote=origin <br> branch.2023q2.merge=refs/heads/2023q2 <br> branch.2023q2.remote=origin <br> branch.advocacy-myths.merge=refs/heads/advocacy-myths <br> branch.advocacy-myths.remote=origin <br> branch.beastie-theme-en.merge=refs/heads/beastie-theme-en <br> branch.beastie-theme-en.remote=origin <br> branch.bug-267176.merge=refs/heads/bug-267176 <br> branch.bug-267176.remote=origin <br> branch.bug-270229-gpl.merge=refs/heads/bug-270229-gpl <br> branch.bug-270229-gpl.remote=origin <br> branch.bug-270338.merge=refs/heads/bug-270338 <br> branch.bug-270338.remote=origin <br> branch.commercial.merge=refs/heads/commercial <br> branch.commercial.remote=origin <br> branch.d39560.merge=refs/heads/main <br> branch.d39560.remote=origin <br> branch.events.merge=refs/heads/events <br> branch.events.remote=origin <br> branch.main.merge=refs/heads/main <br> branch.main.remote=origin <br> branch.patch-1.merge=refs/heads/patch-1 <br> branch.patch-1.remote=origin <br> branch.patch-7.merge=refs/heads/patch-7 <br> branch.patch-7.remote=origin <br> branch.releng/12.4.merge=refs/heads/releng/12.4 <br> branch.releng/12.4.remote=origin <br> branch.status.merge=refs/heads/status <br> branch.status.remote=origin <br> core.bare=false <br> core.filemode=true <br> core.logallrefupdates=true <br> core.repositoryformatversion=0 <br> credential.helper=store --file /usr/doc/.git/.git-credentials <br> remote.freebsd.fetch=+refs/heads/*:refs/remotes/freebsd/* <br> remote.freebsd.fetch=+refs/notes/*:refs/notes/* <br> <a class="moz-txt-link-abbreviated" href="mailto:remote.freebsd.pushurl=git@repo.freebsd.org:doc.git">remote.freebsd.pushurl=git@repo.freebsd.org:doc.git</a> <br> remote.freebsd.url=<a class="moz-txt-link-freetext" href="https://git.freebsd.org/doc.git">https://git.freebsd.org/doc.git</a>; <br> remote.origin.fetch=+refs/heads/*:refs/remotes/origin/* <br> remote.origin.gh-resolved=base <br> remote.origin.url=<a class="moz-txt-link-freetext" href="https://github.com/grahamperrin/freebsd-doc.git">https://github.com/grahamperrin/freebsd-doc.git</a>; <br> remote.upstream.fetch=+refs/heads/main:refs/remotes/upstream/main <br> remote.upstream.url=<a class="moz-txt-link-freetext" href="https://github.com/freebsd/freebsd-doc.git">https://github.com/freebsd/freebsd-doc.git</a>; <br> <a class="moz-txt-link-abbreviated" href="mailto:user.email=grahamperrin@FreeBSD.org">user.email=grahamperrin@FreeBSD.org</a> <br> user.name=Graham Perrin <br> % <br> </span></p> <p>There's a merge conflict aspect to <a class="moz-txt-link-rfc2396E" href="https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally"><https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally></a>, however instructions there seem to be non-applicable. <br> </p> <p>Also, merge conflicts are mentioned in the Committer's Guide, but (sorry) I'm not yet at a point where I can put this in context. <br> </p> </body> <lt-container></lt-container> </html> --------------z0zYsgm2j10b2mydxA6h7m9q--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?e25f395a-825f-aaa4-fb86-d2fcc78a31d5>