Whatever github

This commit is contained in:
Benjamin Bädorf 2021-06-14 23:00:30 +02:00
parent 560fa473a3
commit d9d5d97ee8
No known key found for this signature in database
GPG key ID: 4406E80E13CD656C

View file

@ -20,7 +20,7 @@ steps:
- chmod -R 600 ~/.ssh
- git clone -b devos git@git.b12f.io:pub-solar/os
- cd os
- git remote add devos https://github.com/divnix/devos.git
- git remote add devos git@git.b12f.io:pub-solar/devos
- git fetch --all
- git merge -X theirs devos/core
- git push origin devos