From 285ce4d0f96d8f0c3ee606b0d0da5b10343a3a01 Mon Sep 17 00:00:00 2001
From: Lee Cattarin <lee.cattarin@gmail.com>
Date: Thu, 14 May 2026 10:59:51 -0700
Subject: [PATCH] merge instad of rebase??

---
 .drone.yml  | 2 +-
 .gitmodules | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index d3bd61c..5ded11b 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -14,7 +14,7 @@ steps:
       - npm run build
       - apt-get update && apt-get install -y rsync
       - git config credential.helper '!f() { echo username=inherentlee; echo "password=$GIT_TOKEN"; };f'
-      - git submodule update --remote --init --recursive --rebase
+      - git submodule update --remote --init --recursive --merge
       - rsync -uavh _site/ $REPOSITORY --delete --exclude .git
       - cd $REPOSITORY
       - git status
diff --git a/.gitmodules b/.gitmodules
index d18b837..51db1f2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "mattrbld-site"]
 	path = mattrbld-site
 	url = https://heckin.technology/inherentlee/mattrbld-site.git
-	update = rebase
+	update = merge