From 3662358706c527b293d63487693efc48786907d1 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Tue, 15 Jun 2021 00:41:15 +0200 Subject: [PATCH] git: branch oops --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 3d01ef2e..2094ce97 100644 --- a/.drone.yml +++ b/.drone.yml @@ -19,8 +19,9 @@ steps: from_secret: gitea_ssh_key HOME: /root 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 + - git checkout devos - git remote add devos git@git.b12f.io:pub-solar/devos - git fetch --all - git merge -X theirs devos/core