From nobody Mon Aug 14 17:03:52 2023 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RPgjB6RmJz4Tjqv for ; Mon, 14 Aug 2023 17:03:58 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RPgj938xMz3bMq for ; Mon, 14 Aug 2023 17:03:57 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20221208 header.b=dmWelMOP; spf=pass (mx1.freebsd.org: domain of grahamperrin@gmail.com designates 2a00:1450:4864:20::52e as permitted sender) smtp.mailfrom=grahamperrin@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-ed1-x52e.google.com with SMTP id 4fb4d7f45d1cf-523d0fab783so4031877a12.2 for ; Mon, 14 Aug 2023 10:03:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692032635; x=1692637435; h=subject:from:content-language:to:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=iApWWzTd+02SGaWILO2eW63IhB5mTtE23HOpDqPmD/k=; b=dmWelMOPCFKIc9rCXmoh8FxpezNZ2SqNx/IfUin8pfAmPokgrUn0zP2DwR+oUBkO7W 7GNhaRcEKtTtxmCdPxhA0TdiI6VCiaAmXUSKSKgf15RWUTIVr0eEksjQP0Mn3ah3Q6WK DUWBUQOl1f8CePfckbMhrZgolq+zga2nH+0sRPNUvWs5p/kPTmQ66X1RtwDeXcWjLr6a fZxyBp+Awc45M2pjjJ08iEqz8N8fzA91HUxYYLC+LK9cAT9RHhsSqMuGbRLF48y5WjU4 9RcNutVO6hj0ckzIcalxLCkSnNbQAbFBG9QWr4ephslWABAnUSDi8iQZWzFBWHFDg5la M8qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692032635; x=1692637435; h=subject:from:content-language:to:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=iApWWzTd+02SGaWILO2eW63IhB5mTtE23HOpDqPmD/k=; b=ftXFiD97g+/IFd0LQolqiK89qq63HqcpRDcdXlQzqGYubNgqVZ4HO5gL0g0A/UvsBN J0a9M3Kp775qz13AJg2/IlEsIABI7ewNNqcwhgTxHrCtF2ns5bqD8XtZbzYIDVZjbhBy zRr/AbVYmx4luoEspGaS7AZc8m2v6vTTaI+SBYeAR9jDYNL2fNdVHxijStPSBwqgpTa7 qYZ74A8A5ziVxW9mXASd633XqAeE1tos1d7TbjTuqDFKPCxZTyPKKDOD9C8Lt8ivg8bS UEDRztbVcLiJlzCXghek1e700pIdXGhmPrAagcuKBmjnLsP/dKWCNJs+483zsAdpdh9Z rrpQ== X-Gm-Message-State: AOJu0YxeaH8SYARro9xwI3vOvacGJF2CL+7+vHOyQeY6qoVUxWbyw+R7 I8jORvHcV0tpHKVp2JDhXXPODIHpRWA= X-Google-Smtp-Source: AGHT+IHXaSWwSscDac6EA0orBPpt01PhJ/fKvnPWdrZcKGsVoP9VcBWjCm/m+IwrLZdnmPGQE+DvnQ== X-Received: by 2002:aa7:cd44:0:b0:525:6c9f:e1a3 with SMTP id v4-20020aa7cd44000000b005256c9fe1a3mr1388581edw.20.1692032635077; Mon, 14 Aug 2023 10:03:55 -0700 (PDT) Received: from [192.168.1.10] (80-42-66-93.dynamic.dsl.as9105.com. [80.42.66.93]) by smtp.gmail.com with ESMTPSA id r13-20020aa7d14d000000b005256ae8494asm951813edo.17.2023.08.14.10.03.54 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 14 Aug 2023 10:03:54 -0700 (PDT) Content-Type: multipart/alternative; boundary="------------z0zYsgm2j10b2mydxA6h7m9q" Message-ID: Date: Mon, 14 Aug 2023 18:03:52 +0100 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.14.0 To: freebsd-git Content-Language: en-US From: Graham Perrin Subject: Resolve merge conflicts X-Spamd-Result: default: False [-2.71 / 15.00]; URI_COUNT_ODD(1.00)[21]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-0.99)[-0.993]; NEURAL_HAM_SHORT(-0.71)[-0.712]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20221208]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; FROM_HAS_DN(0.00)[]; FREEFALL_USER(0.00)[grahamperrin]; TO_MATCH_ENVRCPT_ALL(0.00)[]; BLOCKLISTDE_FAIL(0.00)[80.42.66.93:server fail,2a00:1450:4864:20::52e:server fail]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::52e:from]; RCPT_COUNT_ONE(0.00)[1]; RCVD_VIA_SMTP_AUTH(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; MLMMJ_DEST(0.00)[freebsd-git@freebsd.org]; DKIM_TRACE(0.00)[gmail.com:+]; FROM_EQ_ENVFROM(0.00)[]; TO_DN_ALL(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; ARC_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; MID_RHS_MATCH_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; RCVD_COUNT_TWO(0.00)[2] X-Spamd-Bar: -- X-Rspamd-Queue-Id: 4RPgj938xMz3bMq This is a multi-part message in MIME format. --------------z0zYsgm2j10b2mydxA6h7m9q Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Re: I need to resolve merge conflicts. Visually: > … 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 , 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

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--