From 8bfe11d35ef9b6cf15ec4145fe59ab41dcaece96 Mon Sep 17 00:00:00 2001
From: Fabian Gut <fabian.gut.1@post.ch>
Date: Fri, 18 Aug 2023 16:54:42 +0200
Subject: [PATCH] Merge master back into develop after publishing a new release

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

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 466e7d3..6e6bf07 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -39,3 +39,11 @@ jobs:
         CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
         CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
         CI_GPG_PASSPHRASE: ${{ secrets.CI_GPG_PASSPHRASE }}
+
+    - name: Merge back to develop
+      run: |
+        git fetch --depth 1 origin develop
+        git checkout develop
+        git fetch --shallow-since="$(git show -s --format=%ci develop)" origin master develop
+        git merge master --no-edit
+        git push origin develop