diff --git a/.drone.yml b/.drone.yml index d11b6307..c98c0987 100644 --- a/.drone.yml +++ b/.drone.yml @@ -19,8 +19,8 @@ steps: from_secret: gitea_ssh_key HOME: /root commands: - - ./.drone/setup_ssh.sh - git clone -b devos git@git.b12f.io:pub-solar/os . + - ./.drone/setup_ssh.sh - git remote add devos git@git.b12f.io:pub-solar/devos - git fetch --all - git merge -X theirs devos/core