From fd7037d0484e73c3ff2f256190ee0d02a3507b4b Mon Sep 17 00:00:00 2001
From: Fabio Manganiello <fabio@manganiello.tech>
Date: Sun, 1 Oct 2023 23:31:22 +0200
Subject: [PATCH] Added git checkout and rebase commands to sync-stable-branch
 step.

---
 .drone.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index b3f2b8bc..f4dfecb9 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -84,8 +84,11 @@ steps:
     - git remote rm origin
     - git remote add origin git@git.platypush.tech:platypush/platypush.git
 
-    # Push to the `stable` branch
+    # Merge and push to the `stable` branch
+    - git checkout stable
+    - git rebase master
     - git push -u origin stable
+    - git checkout master
 
     # Restore the original git configuration
     - mv /tmp/git.config.orig $GIT_CONF