Update update-submodules.yml

WatermelonKatanaDevs · Nov 18, 2024 · 36cd8ef · 36cd8ef
1 parent a07c229
commit 36cd8ef
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/.github/workflows/update-submodules.yml b/.github/workflows/update-submodules.yml
@@ -20,10 +20,10 @@ jobs:
           git config --global user.name "github-actions[bot]"
           git config --global user.email "github-actions[bot]@users.noreply.github.com"
 
-      # Pull the latest changes for each submodule using merge strategy and allow unrelated histories
-      - name: Pull latest changes for submodules (merge, allow unrelated histories)
+      # Pull the latest changes for each submodule using merge strategy and resolve conflicts automatically
+      - name: Pull latest changes for submodules (auto resolve conflicts)
         run: |
-          git submodule foreach 'git fetch && git pull origin $(git rev-parse --abbrev-ref HEAD) --no-rebase --allow-unrelated-histories'
+          git submodule foreach 'git fetch && git merge -X theirs || true'
 
       # Commit and push changes if any submodules were updated
       - name: Commit and push changes