From e7b3436f731c407b6d2c3dc99510ce6d9d6f2c59 Mon Sep 17 00:00:00 2001 From: Viktor Delev <109960607+dvviktordelev@users.noreply.github.com> Date: Fri, 15 Nov 2024 09:45:21 +0100 Subject: [PATCH] switch to merge --- .github/workflows/release-post-merge.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-post-merge.yml b/.github/workflows/release-post-merge.yml index 9c2f73df..d01f219f 100644 --- a/.github/workflows/release-post-merge.yml +++ b/.github/workflows/release-post-merge.yml @@ -63,7 +63,8 @@ jobs: git config user.name "$GITHUB_ACTOR" git config user.email "<>" git checkout develop - git pull origin main + git fetch origin main + git merge origin/main git push origin develop - name: Update Package Version for Next Development Cycle