merge instad of rebase??

2026-05-14 10:59:51 -07:00
parent 9e79d40d73
commit 285ce4d0f9
2 changed files with 2 additions and 2 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -14,7 +14,7 @@ steps:
      - npm run build
      - apt-get update && apt-get install -y rsync
      - git config credential.helper '!f() { echo username=inherentlee; echo "password=$GIT_TOKEN"; };f'
-      - git submodule update --remote --init --recursive --rebase
+      - git submodule update --remote --init --recursive --merge
      - rsync -uavh _site/ $REPOSITORY --delete --exclude .git
      - cd $REPOSITORY
      - git status