fix/drone-upstream-cron (#40)
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/40 Co-authored-by: teutat3s <teutates@mailbox.org> Co-committed-by: teutat3s <teutates@mailbox.org>
This commit is contained in:
parent
84bb1520ee
commit
d67cc230f3
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue