From nobody Wed Aug  9 13:03:04 2023
X-Original-To: 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 4RLVbb0MJjz4pwtp
	for <git@mlmmj.nyi.freebsd.org>; Wed,  9 Aug 2023 13:03:07 +0000 (UTC)
	(envelope-from marcnarc@gmail.com)
Received: from mail-qk1-x72b.google.com (mail-qk1-x72b.google.com [IPv6:2607:f8b0:4864:20::72b])
	(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 4RLVbZ5Cc2z4Djy
	for <git@freebsd.org>; Wed,  9 Aug 2023 13:03:06 +0000 (UTC)
	(envelope-from marcnarc@gmail.com)
Authentication-Results: mx1.freebsd.org;
	none
Received: by mail-qk1-x72b.google.com with SMTP id af79cd13be357-76ad842d12fso515060685a.3
        for <git@freebsd.org>; Wed, 09 Aug 2023 06:03:06 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20221208; t=1691586186; x=1692190986;
        h=content-transfer-encoding:in-reply-to:from:references:cc:to
         :content-language:subject:user-agent:mime-version:date:message-id
         :from:to:cc:subject:date:message-id:reply-to;
        bh=0Ddwye1YUp9u3tqGy+Pj5T3+YYmPA9+LN4JB+UumkS8=;
        b=E3UjQS+pHE/i0mVin1XzDcBHLkHcH0tExQb8m1I7qbW04NK/zgm2fXjQzT+yGk4j0/
         0uUuAaWvwcdOhfjdjIXkvgD9fFemqQ9Rj2/A+ugDRD3/+AWqPomjXMbbNizHdhO/PIN8
         ntwe/JF+tFTh0PAzoDC8dMw7HfbgdUAqYCjmaiDLnsVMWBag9rzYURtOpqEWQ4LMuM2x
         q5MK23BacuAViJTeSOrO5LvV8ht++fxOosbMdi74ckpE6aeWwbS75axYbDm7h250M0Ry
         2oh0gTSuGHDmX+RK+tMpzDay47plNeMP38Ru7xemJQVH3tgyITIWQm7ilYLrzi5hXmBy
         bgYA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20221208; t=1691586186; x=1692190986;
        h=content-transfer-encoding:in-reply-to:from:references:cc:to
         :content-language:subject:user-agent:mime-version:date:message-id
         :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
        bh=0Ddwye1YUp9u3tqGy+Pj5T3+YYmPA9+LN4JB+UumkS8=;
        b=iC9FfDbH8qfFKgurEUAsdwkbtQaB2nudUufZp0sAJzdSG2rJy08Ouzn/cqlNiTWlAw
         v2fnJrFiawLnQnIkE/wLs8hsZm/4UqZh6d6NgDRn70hcwPJbe1cQxPFc1rTHhy0O2SQ5
         uNYFril3UI589LI3mK+3AxQK/PQFK9fksYsJ2YoGMsGKDy/OFzwTR2VD+Xmhg92AQBQ2
         IgRJ6eKnuJ/wL/hEpiJcwN8gAs1nbpfxe9x7Vm30YUgCeKqh2wr+vBd5mSMb1FHK0f7A
         zGAjjPWW02qC214/vSLDE7UDGmlgIhT2sWak+SU3X1+09j/SU9i4AC4TsSdK5Ezjta/D
         y3iQ==
X-Gm-Message-State: AOJu0YytKGypZhsR2LUzeGauIa4vw3fWI8eT0EYNBCdnTPUyXvsiK879
	MbiDhj3iS5QXyTqRWG6yM0DjAqrGS/EQpA==
X-Google-Smtp-Source: AGHT+IHQZsjC4jMMOn0TTefgIBsw0GtdpCYPfksISO0HjIQKtaEuEEVu+B1l5WZq5DTD3iDi/49s0A==
X-Received: by 2002:a05:620a:4495:b0:76c:a911:f75f with SMTP id x21-20020a05620a449500b0076ca911f75fmr3808865qkp.53.1691586185496;
        Wed, 09 Aug 2023 06:03:05 -0700 (PDT)
Received: from [10.10.0.39] ([216.113.107.66])
        by smtp.gmail.com with ESMTPSA id 24-20020a05620a06d800b00767ed2e6436sm3962530qky.78.2023.08.09.06.03.04
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Wed, 09 Aug 2023 06:03:05 -0700 (PDT)
Message-ID: <df5676c0-335d-9351-3388-9005f9161525@gmail.com>
Date: Wed, 9 Aug 2023 09:03:04 -0400
List-Id: Discussion of git use in the FreeBSD project <freebsd-git.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/freebsd-git
List-Help: <mailto:freebsd-git+help@freebsd.org>
List-Post: <mailto:freebsd-git@freebsd.org>
List-Subscribe: <mailto:freebsd-git+subscribe@freebsd.org>
List-Unsubscribe: <mailto:freebsd-git+unsubscribe@freebsd.org>
Sender: owner-freebsd-git@freebsd.org
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.13.0
Subject: Re: fatal: unable to read <hash>
Content-Language: en-US
To: "Bjoern A. Zeeb" <bzeeb-lists@lists.zabbadoz.net>
Cc: git@freebsd.org
References: <orqq0n25-14pq-nn97-o85p-1p6r107s20ns@yvfgf.mnoonqbm.arg>
 <80c39b3e-9013-22c0-286d-a0ccd05dc21a@gmail.com>
 <r5oq8n6o-82o7-0q0o-on18-1nso4r35q24r@yvfgf.mnoonqbm.arg>
 <22663d4f-df74-e343-c182-64705ec59f5b@gmail.com>
 <qo552875-521o-5364-3sor-3qn06p48op49@yvfgf.mnoonqbm.arg>
 <ddc5e4c5-a11f-52c8-5347-949f12787a6a@gmail.com>
 <p98062q2-o266-rp78-52oo-97p8254673q2@yvfgf.mnoonqbm.arg>
From: Marc Branchaud <marcnarc@gmail.com>
In-Reply-To: <p98062q2-o266-rp78-52oo-97p8254673q2@yvfgf.mnoonqbm.arg>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: 4RLVbZ5Cc2z4Djy
X-Spamd-Bar: ----
X-Rspamd-Pre-Result: action=no action;
	module=replies;
	Message is reply to one we originated
X-Spamd-Result: default: False [-4.00 / 15.00];
	REPLY(-4.00)[];
	ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]


On 2023-08-08 20:31, Bjoern A. Zeeb wrote:
> On Mon, 7 Aug 2023, Marc Branchaud wrote:
> 
>>
>> On 2023-08-07 01:18, Bjoern A. Zeeb wrote:
>>>
>>> %  git fsck --name-objects --connectivity-only --no-dangling
>>> error: b9cdc058e6eb1b3d8b5e29ad9b911d3da98f65a7: invalid sha1 pointer 
>>> in resolve-undo of .git/worktrees/bz_maxmodname_D32383/index
>>> Checking connectivity: 4743571, done.
>>> Verifying commits in commit graph: 100% (384308/384308), done.
>>>
>>> The good news upfront;  I could ditch that worktree and branch if that
>>> will fix things.  It has follow-up work to the 2021 things but I have
>>> a copy of that outside that git tree (I love patch files in port 
>>> trees :)
>>
>> If you no longer need the bz_maxmodname_D32383 worktree, then it 
>> sounds like the easiest solution would be deleting it -- by running
>>     git worktree remove bz_maxmodname_D32383
>> in your "main" repo (which you created with "git clone").
>>
>> (The bz_maxmodname_D32383 branch seems to be OK, according to fsck.)
> 
> And how would one gotten rid of the invalid sha1 pointer in that case?

It depends on the corruption.  The SHA1 IDs are used at all levels in 
Git -- to identify commits, "trees" and "blobs" (files).

> I removed the worktree and gc now finishes.

Glad you worked it out!

		M.

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 <freebsd-git@mlmmj.nyi.freebsd.org>; 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 <freebsd-git@freebsd.org>; 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 <freebsd-git@freebsd.org>; 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 <freebsd-git@freebsd.org>
        (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: <e25f395a-825f-aaa4-fb86-d2fcc78a31d5@gmail.com>
Date: Mon, 14 Aug 2023 18:03:52 +0100
List-Id: Discussion of git use in the FreeBSD project <freebsd-git.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/freebsd-git
List-Help: <mailto:freebsd-git+help@freebsd.org>
List-Post: <mailto:freebsd-git@freebsd.org>
List-Subscribe: <mailto:freebsd-git+subscribe@freebsd.org>
List-Unsubscribe: <mailto:freebsd-git+unsubscribe@freebsd.org>
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 <freebsd-git@freebsd.org>
Content-Language: en-US
From: Graham Perrin <grahamperrin@gmail.com>
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: <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">&lt;https://github.com/grahamperrin/freebsd-doc/tree/commercial&gt;</a>
      I need to resolve merge conflicts. Visually: <br>
    </p>
    <p><a class="moz-txt-link-rfc2396E" href="https://i.imgur.com/6eZo8pP.png">&lt;https://i.imgur.com/6eZo8pP.png&gt;</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">&lt;https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally&gt;</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--

From nobody Mon Aug 14 17:15:38 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 4RPgyn25YKz4TkXJ
	for <freebsd-git@mlmmj.nyi.freebsd.org>; Mon, 14 Aug 2023 17:15:45 +0000 (UTC)
	(envelope-from grahamperrin@gmail.com)
Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533])
	(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 4RPgyl4snJz3cFv
	for <freebsd-git@freebsd.org>; Mon, 14 Aug 2023 17:15:43 +0000 (UTC)
	(envelope-from grahamperrin@gmail.com)
Authentication-Results: mx1.freebsd.org;
	dkim=pass header.d=gmail.com header.s=20221208 header.b=MvoZQ9UZ;
	spf=pass (mx1.freebsd.org: domain of grahamperrin@gmail.com designates 2a00:1450:4864:20::533 as permitted sender) smtp.mailfrom=grahamperrin@gmail.com;
	dmarc=pass (policy=none) header.from=gmail.com
Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-51bece5d935so5937201a12.1
        for <freebsd-git@freebsd.org>; Mon, 14 Aug 2023 10:15:43 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20221208; t=1692033340; x=1692638140;
        h=in-reply-to:references:to:from:content-language:subject:user-agent
         :mime-version:date:message-id:from:to:cc:subject:date:message-id
         :reply-to;
        bh=EWWN6Bt7PasR8iR8O0Uc6xWdmE45BP3naGj+izoOQGI=;
        b=MvoZQ9UZkvsHsAvG703o1G0mqlWCwwO4uWEJv69103SpCFh6thpvtkMlJqYCvCh3wT
         DPDHxeTNEPzxXp0qbHSDUrNhr7rrnQZ+fG1b/NHkWsFh/HiJOzHcLM762UNLIn/ILUyg
         gIA5Sh9n/l+PLuGhIAqsgNqAncEMIccHfW/B/8yEqat9QLrtgkK9tRX6b22PQTynUpPW
         xcKTQajlNXjNQpdwHbJxcsMP8iDpCJ1dCSjo8t6rZSxRYGDDm/DIWxhcdP4iS5J/sP9K
         ceVGdf06HgTt/CGqhwbOHDTK6B7AR+clmPHjrJI2g+DDoZJsQAMEVUwgUSLLY/hQepSW
         Cxkw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20221208; t=1692033340; x=1692638140;
        h=in-reply-to:references:to:from:content-language:subject:user-agent
         :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject
         :date:message-id:reply-to;
        bh=EWWN6Bt7PasR8iR8O0Uc6xWdmE45BP3naGj+izoOQGI=;
        b=ZEwv2HFffzkObBTQeUBwDapx/op2BN+0NWhjZo3Q25XnwCA89KCl7qb0AYMhE4IC0k
         jP4Ft7im5RAevZxwbi34Gwv6e84yo6VzL00VP3N54Iw7rIRzHgs5QHvsAk/DmNGpPyqB
         WAwwkH4SKa9rJQUjARzio+RRsYDmZoFnzC58lGpk8AOZ1yl+FaGXfQVoHqryh2XIaqnr
         L15AB0PG/u9Y63qG2uQjZ1asiiCM+VGf2aUADTxWiGQixtaIv4Z7rVsJlMTVwnIfpsM1
         ruGjcaZHhbme7YgsJfoBH08XUhgz1+k+BBZtrKwzj2Khthuf0XsK1j9xINe03+f9o0Nf
         /stA==
X-Gm-Message-State: AOJu0Yylsek2zU+R5XUa8kl/m46fg+WeJXeB6Bovq7+GA2S6MCw5imRV
	1wdsJUvnWh6+azeIcIyhxnxlirRjni8=
X-Google-Smtp-Source: AGHT+IFDoTI6C3lDyTs1697+gttuXrf0RA9huS79PDOyrTXkH62qX9MocfKVigcEEtW/P7YwNRqm2w==
X-Received: by 2002:a17:907:2c6a:b0:99b:ebf9:90f2 with SMTP id ib10-20020a1709072c6a00b0099bebf990f2mr7878017ejc.45.1692033340569;
        Mon, 14 Aug 2023 10:15:40 -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 sd17-20020a170906ce3100b0099cc3c7ace2sm5932996ejb.140.2023.08.14.10.15.39
        for <freebsd-git@freebsd.org>
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Mon, 14 Aug 2023 10:15:39 -0700 (PDT)
Content-Type: multipart/alternative;
 boundary="------------tBQHyCo7mK2NoBSY4j0MS7Tz"
Message-ID: <f2a930cd-eae8-cb28-9e94-7d5fa7801a31@gmail.com>
Date: Mon, 14 Aug 2023 18:15:38 +0100
List-Id: Discussion of git use in the FreeBSD project <freebsd-git.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/freebsd-git
List-Help: <mailto:freebsd-git+help@freebsd.org>
List-Post: <mailto:freebsd-git@freebsd.org>
List-Subscribe: <mailto:freebsd-git+subscribe@freebsd.org>
List-Unsubscribe: <mailto:freebsd-git+unsubscribe@freebsd.org>
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
Subject: Re: Resolve merge conflicts
Content-Language: en-US
From: Graham Perrin <grahamperrin@gmail.com>
To: freebsd-git <freebsd-git@freebsd.org>
References: <e25f395a-825f-aaa4-fb86-d2fcc78a31d5@gmail.com>
In-Reply-To: <e25f395a-825f-aaa4-fb86-d2fcc78a31d5@gmail.com>
X-Spamd-Result: default: False [-3.99 / 15.00];
	NEURAL_HAM_LONG(-1.00)[-1.000];
	NEURAL_HAM_MEDIUM(-1.00)[-1.000];
	NEURAL_HAM_SHORT(-0.99)[-0.993];
	DMARC_POLICY_ALLOW(-0.50)[gmail.com,none];
	R_DKIM_ALLOW(-0.20)[gmail.com:s=20221208];
	R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36];
	MIME_GOOD(-0.10)[multipart/alternative,text/plain];
	FREEFALL_USER(0.00)[grahamperrin];
	FROM_HAS_DN(0.00)[];
	TO_MATCH_ENVRCPT_ALL(0.00)[];
	PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org];
	BLOCKLISTDE_FAIL(0.00)[80.42.66.93:server fail,2a00:1450:4864:20::533:server fail];
	RCPT_COUNT_ONE(0.00)[1];
	RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::533:from];
	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: 4RPgyl4snJz3cFv

This is a multi-part message in MIME format.
--------------tBQHyCo7mK2NoBSY4j0MS7Tz
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit

On 14/08/2023 18:03, Graham Perrin wrote:

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

--------------tBQHyCo7mK2NoBSY4j0MS7Tz
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>On 14/08/2023 18:03, Graham Perrin wrote:<br>
    </p>
    <blockquote type="cite"
      cite="mid:e25f395a-825f-aaa4-fb86-d2fcc78a31d5@gmail.com">
      <p>Re: <a class="moz-txt-link-rfc2396E"
          href="https://github.com/grahamperrin/freebsd-doc/tree/commercial"
          moz-do-not-send="true">&lt;https://github.com/grahamperrin/freebsd-doc/tree/commercial&gt;</a>
        I need to resolve merge conflicts. Visually: <br>
      </p>
      <p><a class="moz-txt-link-rfc2396E"
          href="https://i.imgur.com/6eZo8pP.png" moz-do-not-send="true">&lt;https://i.imgur.com/6eZo8pP.png&gt;</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>
  </body>
  <lt-container></lt-container>
</html>

--------------tBQHyCo7mK2NoBSY4j0MS7Tz--

From nobody Mon Aug 14 17:22:09 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 4RPh6R07dWz4TkwT
	for <freebsd-git@mlmmj.nyi.freebsd.org>; Mon, 14 Aug 2023 17:22:23 +0000 (UTC)
	(envelope-from wlosh@bsdimp.com)
Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a])
	(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 4RPh6Q5HzBz3dcx
	for <freebsd-git@freebsd.org>; Mon, 14 Aug 2023 17:22:22 +0000 (UTC)
	(envelope-from wlosh@bsdimp.com)
Authentication-Results: mx1.freebsd.org;
	none
Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-5234f46c6f9so6064120a12.3
        for <freebsd-git@freebsd.org>; Mon, 14 Aug 2023 10:22:22 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=bsdimp-com.20221208.gappssmtp.com; s=20221208; t=1692033740; x=1692638540;
        h=cc:to:subject:message-id:date:from:in-reply-to:references
         :mime-version:from:to:cc:subject:date:message-id:reply-to;
        bh=epH/+ViLBM6Ro74Ka8UEKEparEapOVXckZwFTQXVoas=;
        b=mglF3+Qi79awqxg5Wcq+pfzdamkckedOm3zCPI3AtOiZrqXw7FTgJ0n1lNbR7HihEN
         PG55ZdCKuReGDYlTyAFhTjCfy6KKo0TdgWcUAszA6knDorJn2Eok5ObXEmDbHHObZrxM
         1zZk8gn80iZZUFxOp8h3Zo41qucVLnxXMG/vsEKvSrLTJEK+44GjmfD0kZwoKAu3nZPs
         NStxTUjGaM/i9Czup0aVx1wQNfSallsykRDo/K6s4cuiCBPlslZDP5qp9uUUOJ7QBQlL
         geqZID3/GjYtpLWQfKwpQCmdgrpiPxChlJi2U7mu8ABdkcWCvlV5anpHJiv8jqz0FeLJ
         MeBg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20221208; t=1692033740; x=1692638540;
        h=cc:to:subject:message-id:date:from:in-reply-to:references
         :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id
         :reply-to;
        bh=epH/+ViLBM6Ro74Ka8UEKEparEapOVXckZwFTQXVoas=;
        b=cwc+aex71cUFyxDvw1cmybLfXP7BwtTMUeOchRNWJ0mIWc8BVs0dmKAR5H0n9IYpmj
         FxoyJRGQKVGr+hE12QAPaxbyjTWLhfCr35+JKh0OqjA3NFsrWsJHhQXDsEolqBnTuV/s
         sYZkx40vzvZtR2/3VG+1M1SZQFHMcklgGa1XzW7takknyW6u2FwljfqPYL3w5guJaSCc
         ofvRpeYODFfxjsul3KQYfFfYI16qzg2rCr17UdNisAA3mygQ1WgJiemP+gJb6Pj43u8q
         UBWHIm+06HblFfWvHyqMQLLFWxSQ/wJoAiMuQ6OBS4OlGksEP768GdFgYADhqMRdSXC0
         Ac7w==
X-Gm-Message-State: AOJu0YwJwxlhi1EjnYwc99LeJa2186irECxNEECSpYRzualNcHHH6IM8
	WJ3WU/rvSSvuTnUGFLb7yg0Pjkx2GnNslC6xrZD7xpNqamI/6qk3QCc=
X-Google-Smtp-Source: AGHT+IG1YPBBOZeAtbnh9ESVkHylJ60hL3FkEkx7w2jLIzc0XxQNtCmq26miBTtsnzredAORsCbx1t8qSS6x8Ooq+Ys=
X-Received: by 2002:aa7:cc0e:0:b0:523:48d7:70b1 with SMTP id
 q14-20020aa7cc0e000000b0052348d770b1mr7534416edt.19.1692033740328; Mon, 14
 Aug 2023 10:22:20 -0700 (PDT)
List-Id: Discussion of git use in the FreeBSD project <freebsd-git.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/freebsd-git
List-Help: <mailto:freebsd-git+help@freebsd.org>
List-Post: <mailto:freebsd-git@freebsd.org>
List-Subscribe: <mailto:freebsd-git+subscribe@freebsd.org>
List-Unsubscribe: <mailto:freebsd-git+unsubscribe@freebsd.org>
Sender: owner-freebsd-git@freebsd.org
MIME-Version: 1.0
References: <e25f395a-825f-aaa4-fb86-d2fcc78a31d5@gmail.com> <f2a930cd-eae8-cb28-9e94-7d5fa7801a31@gmail.com>
In-Reply-To: <f2a930cd-eae8-cb28-9e94-7d5fa7801a31@gmail.com>
From: Warner Losh <imp@bsdimp.com>
Date: Mon, 14 Aug 2023 11:22:09 -0600
Message-ID: <CANCZdfrKkvmjfB3LGxctV6HtEQNsDXnsuKYsno_gBti_kZHqkw@mail.gmail.com>
Subject: Re: Resolve merge conflicts
To: Graham Perrin <grahamperrin@gmail.com>
Cc: freebsd-git <freebsd-git@freebsd.org>
Content-Type: multipart/alternative; boundary="0000000000000a7b890602e54ede"
X-Rspamd-Queue-Id: 4RPh6Q5HzBz3dcx
X-Spamd-Bar: ----
X-Rspamd-Pre-Result: action=no action;
	module=replies;
	Message is reply to one we originated
X-Spamd-Result: default: False [-4.00 / 15.00];
	REPLY(-4.00)[];
	ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]

--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 &lt;<a href=3D"mailto:grahamperrin@gmail.com">grahamper=
rin@gmail.com</a>&gt; 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">&lt;https://github.com/grahamperrin/freebsd-doc=
/tree/commercial&gt;</a>
        I need to resolve merge conflicts. Visually: <br>
      </p>
      <p><a href=3D"https://i.imgur.com/6eZo8pP.png" target=3D"_blank">&lt;=
https://i.imgur.com/6eZo8pP.png&gt;</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&#39;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 &#39;git rebase -i main $BRANCH&#39; 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--