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 (#119489): https://edk2.groups.io/g/devel/message/119489 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] -=-=-=-=-=-=-=-=-=-=-=-
