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 ; 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 ; 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 ; 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 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 References: In-Reply-To: From: Warner Losh Date: Mon, 14 Aug 2023 11:22:09 -0600 Message-ID: Subject: Re: Resolve merge conflicts To: Graham Perrin Cc: freebsd-git 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 wrote: > On 14/08/2023 18:03, Graham Perrin wrote: > > Re: > I need to > resolve merge conflicts. Visually: > > > > =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


=
On Mon, Aug 14, 2023 at 11:15=E2=80= =AFAM Graham Perrin <grahamper= rin@gmail.com> wrote:
=20 =20 =20

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>

=E2=80=A6 You can resolve merge conflicts u= sing the command line and a text 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)


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.
Not the greatest instructions, I know, but they often have b= een enough for others to make progress.

Warner
--0000000000000a7b890602e54ede--