From 7ead24b609a52e083bf7731dc21388093adc062a Mon Sep 17 00:00:00 2001
From: Victor Martinez <victormartinezrubio@gmail.com>
Date: Thu, 18 Mar 2021 21:14:29 +0000
Subject: [PATCH 1/3] Update .mergify.yml

---
 .mergify.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.mergify.yml b/.mergify.yml
index 99076ea62..5d4dbaf2c 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,4 +1,18 @@
 pull_request_rules:
+  - name: ask to resolve conflict
+    conditions:
+      - conflict
+    actions:
+        comment:
+          message: |
+            This pull request is now in conflicts. Could you fix it @{{author}}? 🙏
+            To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/
+            ```
+            git fetch upstream
+            git checkout -b {{head}} upstream/{{head}}
+            git merge upstream/{{base}}
+            git push upstream {{head}}
+            ```
   - name: Automatic squash and merge on approval with success checks and ready-to-merge label
     conditions:
       - "#approved-reviews-by>=2"

From 64d2b6fbbba574974eab2fea53e1dd22760617d5 Mon Sep 17 00:00:00 2001
From: Victor Martinez <VictorMartinezRubio@gmail.com>
Date: Wed, 7 Apr 2021 13:12:35 +0100
Subject: [PATCH 2/3] CI: use ubuntu-18

---
 .ci/validateWorkersBeatsCi.groovy | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.ci/validateWorkersBeatsCi.groovy b/.ci/validateWorkersBeatsCi.groovy
index c6828f8e0..fed119af1 100644
--- a/.ci/validateWorkersBeatsCi.groovy
+++ b/.ci/validateWorkersBeatsCi.groovy
@@ -71,7 +71,6 @@ pipeline {
               'immutable && windows-2008-r2',
               'immutable && windows-7-32-bit',
               'immutable && windows-7',
-              'ubuntu && immutable',
               'ubuntu-18',
               'ubuntu-20',
               'worker-c07c6107jyw0',  // macOS workers https://beats-ci.elastic.co/label/macosx/

From 856329f4187ea4ec4214258f3ff34fd80812ad1c Mon Sep 17 00:00:00 2001
From: Victor Martinez <VictorMartinezRubio@gmail.com>
Date: Wed, 7 Apr 2021 15:29:00 +0100
Subject: [PATCH 3/3] Revert "Update .mergify.yml"

This reverts commit 7ead24b609a52e083bf7731dc21388093adc062a.
---
 .mergify.yml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 984017466..d02925c87 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,18 +1,4 @@
 pull_request_rules:
-  - name: ask to resolve conflict
-    conditions:
-      - conflict
-    actions:
-        comment:
-          message: |
-            This pull request is now in conflicts. Could you fix it @{{author}}? 🙏
-            To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/
-            ```
-            git fetch upstream
-            git checkout -b {{head}} upstream/{{head}}
-            git merge upstream/{{base}}
-            git push upstream {{head}}
-            ```
   - name: Automatic squash and merge on approval with success checks and ready-to-merge label
     conditions:
       - "#approved-reviews-by>=2"