From 2b323641e0427b7691f4122749b415da793a1ac6 Mon Sep 17 00:00:00 2001
From: Lalatendu Mohanty <lmohanty@redhat.com>
Date: Mon, 13 Apr 2026 16:15:37 -0400
Subject: [PATCH] mergify: add auto-rebase and conflict notification rules

Add two new Mergify rules:
- Auto-rebase approved PRs that are behind main, eliminating
  the need to manually comment "@mergify rebase"
- Notify PR authors when merge conflicts are detected

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

diff --git a/.mergify.yml b/.mergify.yml
index f06b387d..b37575a8 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -77,3 +77,23 @@ pull_request_rules:
     actions:
       merge:
         method: merge
+
+  - name: Auto-rebase approved PRs that are behind
+    conditions:
+      - "-draft"
+      - "-conflict"
+      - "#commits-behind>0"
+      - "base=main"
+      - "#approved-reviews-by>=1"
+    actions:
+      rebase:
+
+  - name: Ping author on conflicts
+    conditions:
+      - "conflict"
+      - "-closed"
+    actions:
+      comment:
+        message: |
+          This pull request has merge conflicts that must be resolved before it can be merged.
+          @{{ author }} please rebase your branch.