Avoid submodule update errors about merging unrelated histories

eliotsykes · Feb 24, 2024 · 514db3f · 514db3f
1 parent f8fd047
commit 514db3f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/update_submodules.yml b/.github/workflows/update_submodules.yml
@@ -33,7 +33,7 @@ jobs:
         run: git checkout -b submodules-update-$TODAY
 
       - name: Run submodule updates
-        run: git submodule update --remote --merge --jobs 4
+        run: git submodule update --remote --checkout --jobs 4
 
       - name: Commit results
         run: git commit -m "Update submodules $TODAY" .