From nobody Sun Aug 27 07:36:31 2023 X-Original-To: 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 4RYQVg3X0Lz4rcVB for ; Sun, 27 Aug 2023 07:36:43 +0000 (UTC) (envelope-from 4250.82.1d5040001bade83.08b53edba66c935941ddb10046ee385b@email-od.com) Received: from s1-b0c6.socketlabs.email-od.com (s1-b0c6.socketlabs.email-od.com [142.0.176.198]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4RYQVf5KJnz4Zxw for ; Sun, 27 Aug 2023 07:36:42 +0000 (UTC) (envelope-from 4250.82.1d5040001bade83.08b53edba66c935941ddb10046ee385b@email-od.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=email-od.com header.s=dkim header.b=kHFvV5d1; spf=pass (mx1.freebsd.org: domain of 4250.82.1d5040001bade83.08b53edba66c935941ddb10046ee385b@email-od.com designates 142.0.176.198 as permitted sender) smtp.mailfrom=4250.82.1d5040001bade83.08b53edba66c935941ddb10046ee385b@email-od.com; dmarc=none DKIM-Signature: v=1; a=rsa-sha256; d=email-od.com;i=@email-od.com;s=dkim; c=relaxed/relaxed; q=dns/txt; t=1693121803; x=1695713803; h=content-transfer-encoding:content-type:mime-version:references:in-reply-to:message-id:subject:to:from:date:x-thread-info:subject:to:from:cc:reply-to; bh=GTwbMfUQqk7G7a6Nr7crPo8E2Nc38Jcf5SklEGS8Q7Y=; b=kHFvV5d156LR44xlegAjih8Q6Mie3uYkz6Xs1Cz0Hd0pR3dgjm4rrpRGuVc4ftyRxgL3xC0/BMj0srjmWMF29KZHr/zBmFUzGUWKIC23vxbiaRfnOPrgrh8hg9YZnzuvSEmIAJoQAF1knD/DjLqHxzqN1Rc2H84mzul4y8JVr10= X-Thread-Info: NDI1MC4xMi4xZDUwNDAwMDFiYWRlODMucXVlc3Rpb25zPWZyZWVic2Qub3Jn Received: from r3.us-east-1.aws.in.socketlabs.com (r3.us-east-1.aws.in.socketlabs.com [142.0.191.3]) by mxsg2.email-od.com with ESMTP(version=Tls12 cipher=Aes256 bits=256); Sun, 27 Aug 2023 03:36:33 -0400 Received: from smtp.lan.sohara.org (EMTPY [185.202.17.215]) by r3.us-east-1.aws.in.socketlabs.com with ESMTP(version=Tls12 cipher=Aes256 bits=256); Sun, 27 Aug 2023 03:36:32 -0400 Received: from [192.168.63.1] (helo=steve.lan.sohara.org) by smtp.lan.sohara.org with smtp (Exim 4.95 (FreeBSD)) (envelope-from ) id 1qaAK0-000753-Aa for questions@freebsd.org; Sun, 27 Aug 2023 08:36:31 +0100 Date: Sun, 27 Aug 2023 08:36:31 +0100 From: Steve O'Hara-Smith To: questions@freebsd.org Subject: Re: git-merge(1) prior to a PR in in the github.com/freebsd area Message-Id: <20230827083631.192eb52f7b99e9ebd6b54ccf@sohara.org> In-Reply-To: References: X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; amd64-portbld-freebsd13.1) X-Clacks-Overhead: "GNU Terry Pratchett" 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 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spamd-Result: default: False [-2.55 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.85)[-0.848]; MV_CASE(0.50)[]; FORGED_SENDER(0.30)[steve@sohara.org,4250.82.1d5040001bade83.08b53edba66c935941ddb10046ee385b@email-od.com]; R_DKIM_ALLOW(-0.20)[email-od.com:s=dkim]; R_SPF_ALLOW(-0.20)[+ip4:142.0.176.0/20]; MIME_GOOD(-0.10)[text/plain]; MLMMJ_DEST(0.00)[questions@freebsd.org]; RCVD_TLS_LAST(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[142.0.191.3:received]; MIME_TRACE(0.00)[0:+]; FROM_NEQ_ENVFROM(0.00)[steve@sohara.org,4250.82.1d5040001bade83.08b53edba66c935941ddb10046ee385b@email-od.com]; ASN(0.00)[asn:7381, ipnet:142.0.176.0/22, country:US]; ARC_NA(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; MID_RHS_MATCH_FROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; DKIM_TRACE(0.00)[email-od.com:+]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; DMARC_NA(0.00)[sohara.org]; DWL_DNSWL_NONE(0.00)[email-od.com:dkim] X-Spamd-Bar: -- X-Rspamd-Queue-Id: 4RYQVf5KJnz4Zxw On Sun, 27 Aug 2023 06:30:12 +0100 Graham Perrin wrote: > 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? IME git rebase is more useful that git merge. -- Steve O'Hara-Smith