From 6ee064cb892cd25cd3c058e0350e58d5568aa0c5 Mon Sep 17 00:00:00 2001
From: Fabio Manganiello <fabio@manganiello.tech>
Date: Mon, 4 Sep 2023 02:53:20 +0200
Subject: [PATCH] Always rebase on pull in .drone.yml.

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

diff --git a/.drone.yml b/.drone.yml
index 3ea4e5434..3979110fc 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -177,7 +177,7 @@ steps:
 
     - echo "--- Parsing metadata"
     - git config --global --add safe.directory $PWD
-    - git pull origin master --tags
+    - git pull --rebase origin master --tags
     - export VERSION=$(python setup.py --version)
     - export HEAD=$(git log | head -1 | awk '{printf "%.8s", $2}')
     - export GIT_VERSION="$VERSION.r$(git log --pretty=oneline HEAD...v$VERSION | wc -l).$HEAD"