From d67cc230f38db1e6a5b2ab61186e16ee833f9895 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Mon, 11 Oct 2021 22:03:38 +0000 Subject: [PATCH] fix/drone-upstream-cron (#40) Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/40 Co-authored-by: teutat3s Co-committed-by: teutat3s --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 7dddd03e..85891705 100644 --- a/.drone.yml +++ b/.drone.yml @@ -19,7 +19,7 @@ steps: - git remote add devos git@git.b12f.io:pub-solar/devos - git remote set-url origin git@git.b12f.io:pub-solar/os - git fetch --all - - git checkout origin/devos + - git checkout -b devos --track origin/devos - git merge -X theirs devos/main - git push origin devos