From 900d19cb7d47e552f25349b1d3b4270f2d47ef42 Mon Sep 17 00:00:00 2001
From: Fabian Gut <fabian.gut.1@post.ch>
Date: Thu, 22 Feb 2024 16:19:08 +0100
Subject: [PATCH] Fetch a bit more history, so the merge from master will not
 fail.

---
 .github/workflows/publish.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 6ca5e4a..54db8ae 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -42,8 +42,8 @@ jobs:
 
     - name: Merge back to develop
       run: |
-        git fetch --depth 1 origin develop
+        git fetch --depth 2 origin develop
         git checkout develop
-        git fetch --shallow-since="$(git show -s --format=%ci develop)" origin master develop
+        git fetch --shallow-since="$(git show -s --format=%ci develop~1)" origin master develop
         git merge master --no-edit
         git push origin develop