From c08e147199b8b393a0883ca6cd4961f1c5c9841d Mon Sep 17 00:00:00 2001
From: andrewc <andrew@micromelon.com.au>
Date: Tue, 24 Oct 2023 15:12:40 +1000
Subject: [PATCH] Non recursive submodules, and --merge flag for submodule
 update

---
 kibot-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kibot-ci.yml b/kibot-ci.yml
index 2913106..f03a474 100644
--- a/kibot-ci.yml
+++ b/kibot-ci.yml
@@ -7,9 +7,9 @@ workflow:
 
 variables:
   GIT_STRATEGY: clone
-  GIT_SUBMODULE_STRATEGY: recursive
+  GIT_SUBMODULE_STRATEGY: normal
   GIT_SUBMODULE_FORCE_HTTPS: "true"
-  GIT_SUBMODULE_UPDATE_FLAGS: --remote
+  GIT_SUBMODULE_UPDATE_FLAGS: --remote --merge
 
 stages:
   - gen_mech