Update ci.yml

lbonaldo · Oct 16, 2023 · 765494a · 765494a
1 parent 6865b66
commit 765494a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -59,7 +59,8 @@ jobs:
           mv *.log Logs_v${{ matrix.version }}
           git add -f Logs_v${{ matrix.version }}
           git commit -m "Update test logs for Julia v${{ matrix.version }}"
-          git pull testlog main # pull again to avoid conflicts from other versions
+          git fetch testlog
+          git merge testlog/main # pull again to avoid conflicts from other versions
           git push testlog main
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}