fix/drone-upstream-cron #40

Merged
teutat3s merged 2 commits from refs/pull/40/head into main 2021-10-11 22:03:38 +00:00

View file

@ -19,7 +19,7 @@ steps:
- git remote add devos git@git.b12f.io:pub-solar/devos
- git remote set-url origin git@git.b12f.io:pub-solar/os
- git fetch --all
- git checkout origin/devos
- git checkout -b devos --track origin/devos
- git merge -X theirs devos/main
- git push origin devos