From 48998b284081c41367ac004e9f71c610295e3db5 Mon Sep 17 00:00:00 2001
From: Janeen Mikell Roberts <57149392+jmikell821@users.noreply.github.com>
Date: Fri, 18 Oct 2024 13:13:13 -0400
Subject: [PATCH 1/2] Update .mergify.yml (#5958)

Adds 8.17.0 to mergify and updates 8.16.

(cherry picked from commit a14abe67f9ef3b116cc88d014b7b3d38ba41860d)

# Conflicts:
#	.mergify.yml
---
 .mergify.yml | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/.mergify.yml b/.mergify.yml
index 52352bba3c..6431e94af5 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -13,6 +13,37 @@ pull_request_rules:
             git merge upstream/{{base}}
             git push upstream {{head}}
             ```
+<<<<<<< HEAD
+=======
+  - name: backport patches to 8.17 branch
+    conditions:
+      - merged
+      - base=main
+      - label=v8.17.0
+    actions:
+      backport:
+        assignees:
+          - "{{ author }}"
+        branches:
+          - "8.x"
+        title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
+        labels:
+          - backport
+  - name: backport patches to 8.16 branch
+    conditions:
+      - merged
+      - base=main
+      - label=v8.16.0
+    actions:
+      backport:
+        assignees:
+          - "{{ author }}"
+        branches:
+          - "8.16"
+        title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
+        labels:
+          - backport
+>>>>>>> a14abe67 (Update .mergify.yml (#5958))
   - name: backport patches to 8.15 branch
     conditions:
       - merged

From 4c8e29b9361845937196d5e776ec63b9f8353b48 Mon Sep 17 00:00:00 2001
From: lcawl <lcawley@elastic.co>
Date: Fri, 18 Oct 2024 10:21:29 -0700
Subject: [PATCH 2/2] Merge conflicts

---
 .mergify.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 6431e94af5..d5b80f2a0d 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -13,8 +13,6 @@ pull_request_rules:
             git merge upstream/{{base}}
             git push upstream {{head}}
             ```
-<<<<<<< HEAD
-=======
   - name: backport patches to 8.17 branch
     conditions:
       - merged
@@ -43,7 +41,6 @@ pull_request_rules:
         title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
         labels:
           - backport
->>>>>>> a14abe67 (Update .mergify.yml (#5958))
   - name: backport patches to 8.15 branch
     conditions:
       - merged