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 ; 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 ; 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 ; 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 (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: Date: Mon, 14 Aug 2023 18:15:38 +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 Subject: Re: Resolve merge conflicts Content-Language: en-US From: Graham Perrin To: freebsd-git References: In-Reply-To: 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: 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. > 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

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