From 2547bb5439e06eda6eb1c767cd118109f7da1bf3 Mon Sep 17 00:00:00 2001
From: Lalatendu Mohanty <lmohanty@redhat.com>
Date: Mon, 13 Apr 2026 18:24:47 -0400
Subject: [PATCH] mergify: switch from rebase to update action

The rebase action for fork PRs is deprecated after July 1, 2026.
Also exclude dependabot[bot] since Mergify cannot impersonate it.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Lalatendu Mohanty <lmohanty@redhat.com>
---
 .mergify.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index b37575a8..dca0c953 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -78,15 +78,16 @@ pull_request_rules:
       merge:
         method: merge
 
-  - name: Auto-rebase approved PRs that are behind
+  - name: Auto-update approved PRs that are behind
     conditions:
       - "-draft"
       - "-conflict"
       - "#commits-behind>0"
       - "base=main"
       - "#approved-reviews-by>=1"
+      - "author!=dependabot[bot]"
     actions:
-      rebase:
+      update:
 
   - name: Ping author on conflicts
     conditions: