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

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

[Nate DeSimone]

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?

Thanks,
Nate


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#115691): https://edk2.groups.io/g/devel/message/115691
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]
-=-=-=-=-=-=-=-=-=-=-=-

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

[Ard Biesheuvel]

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

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

[Marcin Juszkiewicz]

W dniu 21.02.2024 o 2:49 AM, Nate DeSimone pisze:

> 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?

You can configure repository on github to not have merge commits on PR 
merge. Settings allow to choose and you can leave 'allow rebase merging' 
as the only option.

Pull requests functionality cannot be disabled but there are pages 
describing how to reply and close/reject automatically.


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#115720): https://edk2.groups.io/g/devel/message/115720
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]
-=-=-=-=-=-=-=-=-=-=-=-

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

[Michael D Kinney]

Hi Ard,

I disagree.  We have never allowed a force push to the main
branch of TianoCore repos.  This has happened before and
was discussed and the policy is to not fix.  Even the edk2
repo has some merge commits in its history that were discussed
and not fixed.

We can never know how many downstream consumers are syncing
with main branches.

Mike

> -----Original Message-----
> From: Ard Biesheuvel <ardb@kernel.org>
> Sent: Wednesday, February 21, 2024 12:07 AM
> To: devel@edk2.groups.io; Desimone, Nathaniel L
> <nathaniel.l.desimone@intel.com>
> Cc: Kinney, Michael D <michael.d.kinney@intel.com>
> Subject: Re: [edk2-devel] Merge commit in edk2-non-osi
> 
> 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 (#115728): https://edk2.groups.io/g/devel/message/115728
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]
-=-=-=-=-=-=-=-=-=-=-=-

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

[Michael D Kinney]

Thanks for the reminder.  "Require Linear History" was not set
in edk2-non-osi.  It is now.

Mike

> -----Original Message-----
> From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
> Sent: Wednesday, February 21, 2024 12:58 AM
> To: devel@edk2.groups.io; Desimone, Nathaniel L
> <nathaniel.l.desimone@intel.com>
> Cc: Kinney, Michael D <michael.d.kinney@intel.com>
> Subject: Re: [edk2-devel] Merge commit in edk2-non-osi
> 
> W dniu 21.02.2024 o 2:49 AM, Nate DeSimone pisze:
> 
> > 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?
> 
> You can configure repository on github to not have merge commits on PR
> merge. Settings allow to choose and you can leave 'allow rebase
> merging'
> as the only option.
> 
> Pull requests functionality cannot be disabled but there are pages
> describing how to reply and close/reject automatically.


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#115730): https://edk2.groups.io/g/devel/message/115730
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]
-=-=-=-=-=-=-=-=-=-=-=-

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

[Ard Biesheuvel]

On Wed, 21 Feb 2024 at 16:05, Michael D Kinney
<michael.d.kinney@intel.com> wrote:
>
> Hi Ard,
>
> I disagree.  We have never allowed a force push to the main
> branch of TianoCore repos.  This has happened before and
> was discussed and the policy is to not fix.  Even the edk2
> repo has some merge commits in its history that were discussed
> and not fixed.
>
> We can never know how many downstream consumers are syncing
> with main branches.
>

Fair enough. Better to be cautious, and my argument works both ways:
the contents would not change by 'fixing' the history, and this change
does not look problematic for bisect.


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#115751): https://edk2.groups.io/g/devel/message/115751
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]
-=-=-=-=-=-=-=-=-=-=-=-

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

[Nate DeSimone]

> -----Original Message-----
> From: Ard Biesheuvel <ardb@kernel.org>
> Sent: Wednesday, February 21, 2024 3:29 PM
> To: devel@edk2.groups.io; Kinney, Michael D <michael.d.kinney@intel.com>
> Cc: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>
> Subject: Re: [edk2-devel] Merge commit in edk2-non-osi
> 
> On Wed, 21 Feb 2024 at 16:05, Michael D Kinney
> <michael.d.kinney@intel.com> wrote:
> >
> > Hi Ard,
> >
> > I disagree.  We have never allowed a force push to the main branch of
> > TianoCore repos.  This has happened before and was discussed and the
> > policy is to not fix.  Even the edk2 repo has some merge commits in
> > its history that were discussed and not fixed.
> >
> > We can never know how many downstream consumers are syncing with
> main
> > branches.
> >
> 
> Fair enough. Better to be cautious, and my argument works both ways:
> the contents would not change by 'fixing' the history, and this change does not
> look problematic for bisect.

Fair enough, I will continue with my reviews/patch merges.


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#115753): https://edk2.groups.io/g/devel/message/115753
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]
-=-=-=-=-=-=-=-=-=-=-=-