From ae6bf21c8275f7a8541083b60bacdc932d198135 Mon Sep 17 00:00:00 2001 From: Michael Kubacki Date: Tue, 21 Apr 2026 22:49:30 -0400 Subject: [PATCH] .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 --- .mergify/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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