Fetch a bit more history, so the merge from master will not fail.

swisspost · Feb 22, 2024 · 900d19c · 900d19c
1 parent c20cf52
commit 900d19c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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