From d30bbfc92c30e6abc9370279020ab4f8a75f029b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= Date: Mon, 14 Jun 2021 23:09:21 +0200 Subject: [PATCH] git is shit --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5bafa288..d6e30909 100644 --- a/.drone.yml +++ b/.drone.yml @@ -47,8 +47,8 @@ steps: - chmod -R 600 ~/.ssh - cd os - git fetch --all - - git checkout core - - git merge devos + - git checkout --track origin/core + - git merge origin/devos - git push origin core - name: "Notify success"