From nobody Mon Aug 14 18:22:49 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 4RPjSJ70gmz4Tq54 for ; Mon, 14 Aug 2023 18:22:56 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) (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 4RPjSJ53bWz4GxQ for ; Mon, 14 Aug 2023 18:22:56 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-977e0fbd742so600786366b.2 for ; Mon, 14 Aug 2023 11:22:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692037372; x=1692642172; h=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=YT03iU5aE4ZXEztiHDvgxU8UkMF0dCwliyyllv/ANwo=; b=Ny0l820SWATQy0m6LqxMDNhAxuugDRy1hGp5pzzHSgulgZ5IeYORJEZp78HU9whP9p iYWbICDdKiYL2cz/CuuM5XMAZ+FdFgy9rXyUDCqxrnQkCV5BweWltrgNgpd2FuAF6fW/ mb0YsGSxSDZ1JqxsdGvxH9I+0qTz3VzkCC0oJjl6IshJrZmVfTPR3aS9R+kvyQUJDX0M 74QOWbnXXvX0UC8SiIBNgK95+8yTaw8dsIGrh0YR1WhgzqD9R4QvoJCCn9T96Pwcdb7i LBHj+VIF+RxPq+240cDMddvIKpC1SkDRDz1zs1aB51+eqLoTW4AKgvsN4OOpPfDr/rMJ vxlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692037372; x=1692642172; h=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=YT03iU5aE4ZXEztiHDvgxU8UkMF0dCwliyyllv/ANwo=; b=a6TMd5CLU9TJcYSfW7g5DpwFjjmQAjEQiJwdqG+2tlIYtTgeDC2msnNzvgWVM7jcir wba2BngbVlignVx5aMivI/lA38v/C3BmXJRukqK3aiMyle2lkProNY9Z5EjsQ5RPYgsx hmkLAoWkSb04KFI6LdBKtLMoCXVlEv+TbFofffZzdGsOYyryJBkWuZHcLpgVVdWZH29g O9/kY0lJo1TAyPquQgg/bL/Uuvd/CGe2HDDC8tft0RsU6B4meq+/AgUhkZ6B0PxF8i02 vcqR9JPzGCnSTurJ8KejiRIv8T6XCl4gzDMfhFp2KGpP/D7NcUkjbxkj0QGR0kAq0rhg 2kuQ== X-Gm-Message-State: AOJu0Yyi6vug/P9i6EJz1qzRqUiRWX8+s7+QXb6Ml+TbsGWcw3yTUBHT r17E7CRSJGTLJGh+1GscYQp0pTOur2U= X-Google-Smtp-Source: AGHT+IHh9NLVH/w6hI5zIEbzVKGffUJLLiHqdVUm3C4cuL0/W6NOtUbsdp0bW8Z7kMxmLsackDCa5Q== X-Received: by 2002:a17:907:2cea:b0:99b:8c6f:f3af with SMTP id hz10-20020a1709072cea00b0099b8c6ff3afmr7353131ejc.12.1692037371663; Mon, 14 Aug 2023 11:22:51 -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 ox11-20020a170907100b00b00989828a42e8sm5920303ejb.154.2023.08.14.11.22.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 14 Aug 2023 11:22:50 -0700 (PDT) Content-Type: multipart/alternative; boundary="------------IqeTbsvtORv2mia1QeruZYVt" Message-ID: Date: Mon, 14 Aug 2023 19:22:49 +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 To: Warner Losh Cc: freebsd-git References: From: Graham Perrin In-Reply-To: X-Rspamd-Queue-Id: 4RPjSJ53bWz4GxQ 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] This is a multi-part message in MIME format. --------------IqeTbsvtORv2mia1QeruZYVt Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 14/08/2023 18:22, Warner Losh wrote: > … Generally, I do a 'git rebase -i main $BRANCH' and then … Thanks. lines 20 and 21, I never figured out whether it's possible to rebase against freebsd main. (Alone, git -C /usr/doc rebase is against my fork.) --------------IqeTbsvtORv2mia1QeruZYVt Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 8bit
On 14/08/2023 18:22, Warner Losh wrote:
… Generally, I do a 'git rebase -i main $BRANCH' and then …


Thanks.

<https://reviews.freebsd.org/P609$20-21> lines 20 and 21, I never figured out whether it's possible to rebase against freebsd main.

(Alone, git -C /usr/doc rebase is against my fork.)

--------------IqeTbsvtORv2mia1QeruZYVt--