diff --git a/.drone.yml b/.drone.yml index 911059a3..62f73181 100644 --- a/.drone.yml +++ b/.drone.yml @@ -35,6 +35,7 @@ steps: from_secret: gitea_ssh_key commands: - ./.drone/setup_ssh.sh + - git fetch --all - git checkout origin/devos - git merge -X theirs devos/main - git push origin devos