diff options
| author | Michael Kubacki <michael.kubacki@microsoft.com> | 2026-04-21 22:49:30 -0400 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2026-07-01 02:52:29 +0000 |
| commit | ae6bf21c8275f7a8541083b60bacdc932d198135 (patch) | |
| tree | 7b1f0d6a850c66605c2dd22925ee6721b0263d43 | |
| parent | 7bd23c60e83d1746a3574b5a855c4689b8d25e9d (diff) | |
| download | edk2-ae6bf21c8275f7a8541083b60bacdc932d198135.tar.gz edk2-ae6bf21c8275f7a8541083b60bacdc932d198135.zip | |
.mergify/config.yml: Set update_method to merge
Originally, edk2 sought to have mergify use rebases to update PR
branches. However, mergify is deprecating pull requests from forks
with update_method=rebase and update_bot_account impersonation:
Deprecation notice: This pull request comes from a fork and was
queued with update_method=rebase and update_bot_account
impersonation. This capability will be removed on July 1, 2026.
After this date, the merge queue will no longer be able to rebase
fork pull requests with this configuration. To avoid disruption,
switch to update_method=merge in configuration. To avoid disruption,
switch to update_method=merge in your queue rule.
This change explicitly sets the update_method to merge per the
deprecation guidance.
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
| -rw-r--r-- | .mergify/config.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.mergify/config.yml b/.mergify/config.yml index 46ca46da26..96314a63eb 100644 --- a/.mergify/config.yml +++ b/.mergify/config.yml @@ -34,7 +34,7 @@ queue_rules: - label=push
merge_method: rebase
update_bot_account: tianocore-issues
- update_method: rebase
+ update_method: merge
pull_request_rules:
- name: Automatically merge a PR when all required checks pass and 'push' label is present
|