From 36cd8efeabce10aa5c77e29588b24c7c7792c24f Mon Sep 17 00:00:00 2001 From: Colack Date: Mon, 18 Nov 2024 07:56:58 -0800 Subject: [PATCH] Update update-submodules.yml --- .github/workflows/update-submodules.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/update-submodules.yml b/.github/workflows/update-submodules.yml index cbc6379e..3c6607b8 100644 --- 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