From ee955882bfab30da6ef5f6ee8920a1742612c732 Mon Sep 17 00:00:00 2001
From: Fabio Manganiello <fabio@manganiello.tech>
Date: Thu, 31 Aug 2023 02:11:50 +0200
Subject: [PATCH] Always rebase when pulling from the Github remote.

---
 .drone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 45b8102cf..780d69a46 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -29,7 +29,7 @@ steps:
     - ssh-keyscan github.com >> ~/.ssh/known_hosts 2>/dev/null
     - git config --global --add safe.directory $PWD
     - git remote add github git@github.com:/BlackLight/platypush.git
-    - git pull github master
+    - git pull --rebase github master
     - git push --all -v github
 
 - name: docs