Merge pull request #310 from Zemnmez/version-pipelining

Re-work merging for PR a bit
zemn-me · Jun 6, 2022 · 7dd254a · 7dd254a
2 parents eb489fc + affd702
commit 7dd254a
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -97,10 +97,8 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: Checkout 'versioned' branch
-        run: git checkout versioned
-      - name: Merge with our branch
-        run: git merge main
+      - name: Merge with versioned
+        run: git merge versioned
       - name: Open PR to 'versioned' branch
         run: gh pr create -f
         env: