From nobody Sun Aug 27 05:30:12 2023 X-Original-To: freebsd-questions@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 4RYMht03xPz4rVNC for ; Sun, 27 Aug 2023 05:30:22 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) (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 4RYMhs0rmGz4DQs for ; Sun, 27 Aug 2023 05:30:21 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20221208 header.b=p9G77O7D; spf=pass (mx1.freebsd.org: domain of grahamperrin@gmail.com designates 2a00:1450:4864:20::62a as permitted sender) smtp.mailfrom=grahamperrin@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-99bf8e5ab39so271367366b.2 for ; Sat, 26 Aug 2023 22:30:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693114218; x=1693719018; h=content-transfer-encoding:subject:from:content-language:to :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=S1pp4mLHd6vS3li0cXoHlpLF5G30tAKpz2y0lle6usg=; b=p9G77O7DQdqDvZf+HW6i4qzPKy6FgQKJFCRTTNEMbHvIo9AhS309w9HMl4nPBMnVbn GYiwvaTbDsyd+7Th2Tp4tLGrTKIPjOAud1ghfpJB65a/FAWE7FBbaalShng1Xq6uzLHl xUDVYEF0cfluaHqOTLRflcfyn9zUPqUA8o3hJlTIWfWvzH5ELxo7UYZuOoly1YAIJcPE Q9czVhSjp6IseGfC+6t/mctzQkPaO8DMpxGuDwlYgVlK88qxVvGopsjhrq8WDyZwR/O0 Ds9KAmAQYqSm/8WOv/Slo1TVkjLcTGbDauoiY8s/XWVUqpNyYyb9/H4Xd3TsHnd1N+LJ 1Ayw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693114218; x=1693719018; h=content-transfer-encoding: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=S1pp4mLHd6vS3li0cXoHlpLF5G30tAKpz2y0lle6usg=; b=jtXLsWA2KztKcp8RDOqu7nnJxB5V2mmCZ+IUmdQVKCv9U6rhfjqlymn/4+2vGU4bGm JNX7jPzAG9dY/vLLZeVZIEFuXrVyKINxlerCjtszDmYXm5Pvqp8beKqmdrmFbcOwPT4m 7jKuPkdGnB/l/glWUe1/C6vkrJGUBAFqawajjL9c9TEN41C1tz/FEifiQEzc/ZN6v1an eznUCDTkHr0Ny/XcsEJ9tsSUtEyt5KxcHdvx37TL1EEpLrKRLaGhx2IQlwL2Lh102PX3 wuMjwAbzfk22b+h+lXzlaV9Awg0K+r6yN1coh5Ybt69nNhq2HTJ7BaOkq+y/agAenu28 EVEg== X-Gm-Message-State: AOJu0YzW22rBQXl9HqOEKr7efvCAWi6aQiYJfIzVdUhTVFS0ZCWS2HgY eigZddRE/2QaoaWkUE9dlYUW2V0SEHc= X-Google-Smtp-Source: AGHT+IF7sw3Qs8kc1oTlCd1ODUS/lVm+nbiTZw7QXAFXguVF2TzVXkKRuhhC1VewtFpL8WVhn299kg== X-Received: by 2002:a17:906:2d0:b0:9a1:d0bb:d215 with SMTP id 16-20020a17090602d000b009a1d0bbd215mr8782075ejk.5.1693114217918; Sat, 26 Aug 2023 22:30:17 -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 f24-20020a1709067f9800b00977eec7b7e8sm3032085ejr.68.2023.08.26.22.30.15 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 26 Aug 2023 22:30:16 -0700 (PDT) Message-ID: Date: Sun, 27 Aug 2023 06:30:12 +0100 List-Id: User questions List-Archive: https://lists.freebsd.org/archives/freebsd-questions List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-questions@freebsd.org X-BeenThere: freebsd-questions@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 questions Content-Language: en-US From: Graham Perrin Subject: git-merge(1) prior to a PR in in the github.com/freebsd area Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spamd-Result: default: False [-4.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.999]; 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)[text/plain]; FROM_HAS_DN(0.00)[]; FREEFALL_USER(0.00)[grahamperrin]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; PREVIOUSLY_DELIVERED(0.00)[freebsd-questions@freebsd.org]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::62a:from]; ARC_NA(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; MID_RHS_MATCH_FROM(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; TO_DN_ALL(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; MLMMJ_DEST(0.00)[freebsd-questions@freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_COUNT_TWO(0.00)[2] X-Spamd-Bar: --- X-Rspamd-Queue-Id: 4RYMhs0rmGz4DQs I have a checkout of , and need to squash before I create a PR at , but I can't make sense of git-merge(1). Can anyone steer me? TIA