switch to merge

datavisyn · Nov 15, 2024 · e7b3436 · e7b3436
1 parent 0ea392a
commit e7b3436
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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