chore: improve release flow

cloudinary · Jan 30, 2025 · 339c3b6 · 339c3b6
1 parent 110e11a
commit 339c3b6
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.github/workflows/release-edge.yml b/.github/workflows/release-edge.yml
@@ -43,6 +43,7 @@ jobs:
           git fetch origin
           if git rev-parse --verify origin/${{ steps.get_next_version.outputs.version }}-edge; then
             git checkout ${{ steps.get_next_version.outputs.version }}-edge
+            git merge master
           else
             git checkout -b ${{ steps.get_next_version.outputs.version }}-edge
           fi