From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id CD372D801B3 for ; Wed, 21 Feb 2024 08:06:59 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=OFbRVxfDbXAfu1FciJ6wEk+bX/gUdTAAzv+8PZjeNec=; c=relaxed/simple; d=groups.io; h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject:To:Cc:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Type:Content-Transfer-Encoding; s=20140610; t=1708502818; v=1; b=XYFmjTJtsGpS3/JAes3wH0GusWYx2nleWOJlLVkSdW4wDJ3rJadIc2Q3qhEUS0INNclVzrea Ve39S/Pe6fnRQsBrA6vUeD3ycG5/+eOUnQcDeMysNA73aipzMMrf220eNbjn/zvueIX+0ylafI/ RBEYXuo4l6nQsQwsGgc16xlg= X-Received: by 127.0.0.2 with SMTP id lBIgYY7687511xGfZq8R4YHO; Wed, 21 Feb 2024 00:06:58 -0800 X-Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by mx.groups.io with SMTP id smtpd.web10.8569.1708502817617358258 for ; Wed, 21 Feb 2024 00:06:57 -0800 X-Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 7B571CE1C79 for ; Wed, 21 Feb 2024 08:06:54 +0000 (UTC) X-Received: by smtp.kernel.org (Postfix) with ESMTPSA id B53E4C433F1 for ; Wed, 21 Feb 2024 08:06:53 +0000 (UTC) X-Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-512be9194b7so2899260e87.1 for ; Wed, 21 Feb 2024 00:06:53 -0800 (PST) X-Gm-Message-State: aLnhxGGDMZ3hz1TvICwRnhlnx7686176AA= X-Google-Smtp-Source: AGHT+IGjcltzX8qzOdPZmrfhK3VYiBaW9lQ6cQPOjsjjDcsPCibino+9tFHqqZ2hSqaI14EHCh/adus63QiJncL/Ov0= X-Received: by 2002:a05:6512:4027:b0:512:a52f:468a with SMTP id br39-20020a056512402700b00512a52f468amr8765595lfb.46.1708502811771; Wed, 21 Feb 2024 00:06:51 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: "Ard Biesheuvel" Date: Wed, 21 Feb 2024 09:06:40 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [edk2-devel] Merge commit in edk2-non-osi To: devel@edk2.groups.io, nathaniel.l.desimone@intel.com Cc: "Kinney, Michael D" Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ardb@kernel.org List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=XYFmjTJt; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=kernel.org (policy=none) On Wed, 21 Feb 2024 at 02:49, Nate DeSimone wrote: > > Hi Everyone, > > It appears that a merge commit was introduced to edk2-non-osi due to a PR= merge: > > https://github.com/tianocore/edk2-non-osi/commit/61b65fccfe4c75bc9ecb7b54= 2412a436e3db5de6 > > I would like to remind everyone that we generally don't accept submission= s via PRs yet. At the very least please click "Rebase and merge" when closi= ng the PR instead of "Merge pull request". Since that merge commit is curre= ntly at the top of the tree, can we delete it? > I think force rebasing is fine in this particular case - the file contents will remain the same, it is just the git history that gets linearized, so everyone that pulls from it should get the expected results. -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#115719): https://edk2.groups.io/g/devel/message/115719 Mute This Topic: https://groups.io/mt/104481195/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-