From 2b7ecd226b8c576667adc7d9f79e7c4fc069aef1 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 12 May 2026 13:50:04 +0000
Subject: [PATCH 1/2] Initial plan


From fab8b499cf6676131181281c0e3b79afd43467af Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 12 May 2026 13:53:50 +0000
Subject: [PATCH 2/2] fix: update mergify queue settings for required
 up-to-date branches

Agent-Logs-Url: https://github.com/elastic/apm-server/sessions/b62a7a2c-6a49-4423-a023-5737e076794d

Co-authored-by: v1v <2871786+v1v@users.noreply.github.com>
---
 .mergify.yml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/.mergify.yml b/.mergify.yml
index 57bab262dd9..e4c2d66ebf3 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -4,10 +4,22 @@ commands_restrictions:
       - or:
           - sender-permission>=write
           - sender=github-actions[bot]
+merge_queue:
+  max_parallel_checks: 1
+
 queue_rules:
   - name: default
+    batch_size: 1
     merge_method: squash
-    conditions:
+    queue_conditions:
+      - check-success=test (macos-latest)
+      - or:
+        - check-success=test (windows-2025)
+        - check-success=test (windows-latest)
+      - check-success=system-test
+      - check-success=lint
+      - check-success=CLA
+    merge_conditions:
       - check-success=test (macos-latest)
       - or:
         - check-success=test (windows-2025)