teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity

fix/drone-upstream-cron (#40)

Browse source 
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:
teutat3s 2021-10-11 22:03:38 +00:00
parent 84bb1520ee
commit d67cc230f3
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.drone.yml
View file

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