From c4f7d7faf18e5e57f58f4bb3c36364835beacce2 Mon Sep 17 00:00:00 2001
From: chinosk <2248589280@qq.com>
Date: Tue, 18 Jun 2024 09:50:56 +0800
Subject: [PATCH] update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 89f6156..fb7ddb7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,7 +29,7 @@ jobs:
 
     - name: Update Assets
       run: |
-        git submodule foreach --recursive git pull origin main
+        git submodule foreach --recursive 'git pull --no-rebase origin main'
         git clone https://${{ secrets.ACCESS_TOKEN_GITHUB }}@github.com/imas-tools/gakumas-raw-txts.git app/src/main/assets/gakumas-local/gakumas-raw-txts
         mv app/src/main/assets/gakumas-local/gakumas-raw-txts/Resource app/src/main/assets/gakumas-local/raw
         rm -rf app/src/main/assets/gakumas-local/gakumas-raw-txts