pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity

git: branch oops

Browse source
This commit is contained in:
teutat3s 2021-06-15 00:41:15 +02:00
parent eb39742886
commit 3662358706
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.drone.yml
View file

@ -19,8 +19,9 @@ steps:
from_secret: gitea_ssh_key from_secret: gitea_ssh_key
HOME: /root HOME: /root
commands: commands:
- git clone -b devos https://git.b12f.io/pub-solar/os . - git clone -b feat/upstreaming https://git.b12f.io/pub-solar/os .
- ./.drone/setup_ssh.sh - ./.drone/setup_ssh.sh
- git checkout devos
- git remote add devos git@git.b12f.io:pub-solar/devos - git remote add devos git@git.b12f.io:pub-solar/devos
- git fetch --all - git fetch --all
- git merge -X theirs devos/core - git merge -X theirs devos/core