The Merge button may not work in that case either if there is parallel activity by other developers or Mergify. Using the "push" label is recommended so Maintainers do not have to wait and rebase.
I understand the desire to apply to other repos quickly. Let's work through some of these known issues for another week and then evaluate if it should be applied to edk2-platforms yet. Mike > -----Original Message----- > From: Rebecca Cran <rebe...@os.amperecomputing.com> > Sent: Wednesday, June 5, 2024 3:48 PM > To: devel@edk2.groups.io; Kinney, Michael D <michael.d.kin...@intel.com> > Subject: Re: [edk2-devel] GitHub PR Code Review process now active > > On 6/5/2024 4:21 PM, Michael D Kinney via groups.io wrote: > > * Some PRs have been merged using the "Rebase and Merge" button in the > > PR after all required reviews completed and all CI checks pass. Instead, > > the "push" label should continue to be used. There does not appear to be > > any unexpected side effects from the "Rebase and Merge" button, but that > > option is not available if the PR needs to be rebased. This is what > > Mergify handles through a merge queue, so the easiest way to merge right > > now is the "push" label. > > > > If the most recent commit was not performed by an EDK II Maintainers, > then > > Mergify attempt to rebase may fail. > > > > Mitigation #1: EDK II Maintainer perform a rebase > > Mitigation #2: Update Mergify to use a bot account with write > permission > > to perform rebase operations. > > > > There was feedback earlier in the year that the git commit history does > > not indicate which maintainer was the committer. Instead it always > shows > > Mergify. > > > > The use of GitHub Merge Queues will be evaluated to see if it can be > used > > instead of Mergify and remove the need for the "push" label and allow > the > > "Rebase and Merge" button to be used and avoid the Mergify permission > issues. > > So it sounds like using the "Merge" button is fine as long as the user > understands they may need to rebase, wait for CI to finish and then merge? > > Also, is there a timeline on enabling PRs for the other repos? I'd > really like to switch to them for edk2-platforms, even if it means > having to update settings in multiple repos as we find issues with the > process. > > > -- > Rebecca Cran -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#119491): https://edk2.groups.io/g/devel/message/119491 Mute This Topic: https://groups.io/mt/106355103/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
