From 70bb165bdb9dfecba62bf7af853264cebd4eb0a3 Mon Sep 17 00:00:00 2001 From: "Hunter T." Date: Tue, 26 Nov 2024 12:54:45 -0800 Subject: [PATCH] Update update_from_submodule.yml Signed-off-by: Hunter T. --- .github/workflows/update_from_submodule.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update_from_submodule.yml b/.github/workflows/update_from_submodule.yml index 23056f9..4864f55 100644 --- a/.github/workflows/update_from_submodule.yml +++ b/.github/workflows/update_from_submodule.yml @@ -41,7 +41,7 @@ jobs: git commit -m "Update file after submodule update" || echo "No changes to commit" - name: Configure Git Pull Strategy - run: git config pull.ff only + run: git config pull.rebase true - name: Pull latest changes run: git pull origin main