From 72653c976743bfacca68541cc30c6b8bcdb7e31a Mon Sep 17 00:00:00 2001
From: Ludger Sicking <sicking@comenius.de>
Date: Mon, 4 Nov 2024 14:56:19 +0100
Subject: [PATCH] avoid "refusing to merge unrelated histories"

wir brauchen keinen merge, wir wollen nur den aktuellen Stand
---
 .woodpecker/build_and_copy_blog.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.woodpecker/build_and_copy_blog.yaml b/.woodpecker/build_and_copy_blog.yaml
index 53eec75..38d32ee 100644
--- a/.woodpecker/build_and_copy_blog.yaml
+++ b/.woodpecker/build_and_copy_blog.yaml
@@ -16,7 +16,7 @@ steps:
     image: hugomods/hugo
     commands:
       - hugo version
-      - git -C sb/themes/ submodule update --remote --merge --recursive
+      - git -C sb/themes/ submodule update --remote --recursive
       - hugo --cleanDestinationDir -s sb --logLevel info
 
   - name: copy_to_server