merge instad of rebase??
Some checks failed
continuous-integration/drone/push Build is failing

This commit is contained in:
2026-05-14 10:59:51 -07:00
parent 9e79d40d73
commit 285ce4d0f9
2 changed files with 2 additions and 2 deletions

View File

@ -14,7 +14,7 @@ steps:
- npm run build - npm run build
- apt-get update && apt-get install -y rsync - apt-get update && apt-get install -y rsync
- git config credential.helper '!f() { echo username=inherentlee; echo "password=$GIT_TOKEN"; };f' - 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 - rsync -uavh _site/ $REPOSITORY --delete --exclude .git
- cd $REPOSITORY - cd $REPOSITORY
- git status - git status

2
.gitmodules vendored
View File

@ -1,4 +1,4 @@
[submodule "mattrbld-site"] [submodule "mattrbld-site"]
path = mattrbld-site path = mattrbld-site
url = https://heckin.technology/inherentlee/mattrbld-site.git url = https://heckin.technology/inherentlee/mattrbld-site.git
update = rebase update = merge