Windows compatibility

mimesis-inria · Aug 4, 2023 · 34dbe28 · 34dbe28
1 parent 8984c38
commit 34dbe28
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -37,7 +37,7 @@ jobs:
           git config --global user.email "caribou@github.com"
           git config --global user.name "Caribou Github"
           git fetch origin
-          git rebase origin/master
+          git merge origin/master
 
       - name: Install pybind11
         if: ${{ matrix.PYBIND11_VERSION != '2.4' }}

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -45,7 +45,7 @@ jobs:
           git config --global user.email "caribou@github.com"
           git config --global user.name "Caribou Github"
           git fetch origin
-          git rebase origin/master
+          git merge origin/master
 
 #     Python
       - name: Set up Python