Re: [edk2-devel] Merge commit in edk2-non-osi

["Ard Biesheuvel" <ardb@kernel.org>]

On Wed, 21 Feb 2024 at 02:49, Nate DeSimone
<nathaniel.l.desimone@intel.com> 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/61b65fccfe4c75bc9ecb7b542412a436e3db5de6
>
> I would like to remind everyone that we generally don't accept submissions via PRs yet. At the very least please click "Rebase and merge" when closing the PR instead of "Merge pull request". Since that merge commit is currently 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.


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