[edk2-devel] GitHub PRs and Mergify: " Allow edits from maintainers" needs to be enabled

[edk2-devel] GitHub PRs and Mergify: " Allow edits from maintainers" needs to be enabled

[Rebecca Cran]

I'm having problems merging https://github.com/tianocore/edk2/pull/5774 
- Mergify reports:


The merge queue pull request can't be updated
Details:

    Pull request can't be updated with latest base branch changes

    Mergify needs the author permission to update the base branch of the
    pull request.
    @Beckhoff <https://github.com/Beckhoff> needs to authorize
    modification on its head branch
    <https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork>.


It looks like we need to require users creating PRs to enable the "Allow 
edits from maintainers" settin*g?*
*
*
*--
Rebecca Cran
*



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119593): https://edk2.groups.io/g/devel/message/119593
Mute This Topic: https://groups.io/mt/106723083/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] GitHub PRs and Mergify: " Allow edits from maintainers" needs to be enabled

[Michael D Kinney]

I highlighted this issue in a summary before.

When this is seen, a Maintainer need to request a rebase.

Mike

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Rebecca Cran
> Sent: Monday, June 17, 2024 8:43 AM
> To: devel@edk2.groups.io; Kinney, Michael D <michael.d.kinney@intel.com>;
> Michael Kubacki <mikuback@linux.microsoft.com>
> Subject: [edk2-devel] GitHub PRs and Mergify: " Allow edits from maintainers"
> needs to be enabled
> 
> I'm having problems merging https://github.com/tianocore/edk2/pull/5774
> - Mergify reports:
> 
> 
> The merge queue pull request can't be updated
> Details:
> 
>     Pull request can't be updated with latest base branch changes
> 
>     Mergify needs the author permission to update the base branch of the
>     pull request.
>     @Beckhoff <https://github.com/Beckhoff> needs to authorize
>     modification on its head branch
>     <https://docs.github.com/en/pull-requests/collaborating-with-pull-
> requests/working-with-forks/allowing-changes-to-a-pull-request-branch-
> created-from-a-fork>.
> 
> 
> It looks like we need to require users creating PRs to enable the "Allow
> edits from maintainers" settin*g?*
> *
> *
> *--
> Rebecca Cran
> *
> 
> 
> 
> 
> 



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119594): https://edk2.groups.io/g/devel/message/119594
Mute This Topic: https://groups.io/mt/106723083/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] GitHub PRs and Mergify: " Allow edits from maintainers" needs to be enabled

[Michael D Kinney]

Hi Rebecca,

I see you have already attempted this.

I read the message/docs.  Perhaps the right thing to do here is for
contributors to change that setting.

What is strange is that the GitHub option to rebase the branch is also
not available, and it usually is.

Mike

> -----Original Message-----
> From: Kinney, Michael D <michael.d.kinney@intel.com>
> Sent: Monday, June 17, 2024 9:29 AM
> To: devel@edk2.groups.io; rebecca@bsdio.com; Michael Kubacki
> <mikuback@linux.microsoft.com>
> Cc: Kinney, Michael D <michael.d.kinney@intel.com>
> Subject: RE: [edk2-devel] GitHub PRs and Mergify: " Allow edits from
> maintainers" needs to be enabled
> 
> I highlighted this issue in a summary before.
> 
> When this is seen, a Maintainer need to request a rebase.
> 
> Mike
> 
> > -----Original Message-----
> > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Rebecca Cran
> > Sent: Monday, June 17, 2024 8:43 AM
> > To: devel@edk2.groups.io; Kinney, Michael D <michael.d.kinney@intel.com>;
> > Michael Kubacki <mikuback@linux.microsoft.com>
> > Subject: [edk2-devel] GitHub PRs and Mergify: " Allow edits from
> maintainers"
> > needs to be enabled
> >
> > I'm having problems merging https://github.com/tianocore/edk2/pull/5774
> > - Mergify reports:
> >
> >
> > The merge queue pull request can't be updated
> > Details:
> >
> >     Pull request can't be updated with latest base branch changes
> >
> >     Mergify needs the author permission to update the base branch of the
> >     pull request.
> >     @Beckhoff <https://github.com/Beckhoff> needs to authorize
> >     modification on its head branch
> >     <https://docs.github.com/en/pull-requests/collaborating-with-pull-
> > requests/working-with-forks/allowing-changes-to-a-pull-request-branch-
> > created-from-a-fork>.
> >
> >
> > It looks like we need to require users creating PRs to enable the "Allow
> > edits from maintainers" settin*g?*
> > *
> > *
> > *--
> > Rebecca Cran
> > *
> >
> >
> >
> > 
> >



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119595): https://edk2.groups.io/g/devel/message/119595
Mute This Topic: https://groups.io/mt/106723083/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-