git is shit

2021-06-14 23:09:21 +02:00 · 2021-06-14 23:09:21 +02:00 · d30bbfc92c
parent cd0a7621fc
commit d30bbfc92c
1 changed files with 2 additions and 2 deletions
--- 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"