From cd0a7621fc35f171b9ebf13abbff1f34bf7a2f66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= Date: Mon, 14 Jun 2021 23:07:08 +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 926670fd..5bafa288 100644 --- a/.drone.yml +++ b/.drone.yml @@ -47,8 +47,8 @@ steps: - chmod -R 600 ~/.ssh - cd os - git fetch --all - - git checkout origin/core - - git merge origin/devos + - git checkout core + - git merge devos - git push origin core - name: "Notify success"