From 6bee719969ef682ff991cbdf32db1d34c8d0f4d0 Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@mozilla.com>
Date: Wed, 31 Aug 2022 18:39:34 +0200
Subject: [PATCH] mergify: auto-merge relbot PRs that target the main branch

---
 .mergify.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 5e087e543..23564e676 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -5,11 +5,16 @@ queue_rules:
         - status-success=complete-pr
         - and:
           # For more context, see "Auto Merge" rules down below
-          - base~=^releases[_/].*
           - status-success=complete-push
           - or:
-            - head~=^automation/sync-strings-\d+
-            - head~=^relbot/fenix-\d+
+            - and:
+              - base~=^releases[_/].*
+              - or:
+                - head~=^automation/sync-strings-\d+
+                - head~=^relbot/fenix-\d+
+            - and:
+              - base=main
+              - head~=^relbot/AC-Nightly-.+
 pull_request_rules:
   - name: Resolve conflict
     conditions: