From a15ea1b3aedd0d8c1f49e70f04241a6fc6060add Mon Sep 17 00:00:00 2001
From: giles <giles.bradshaw@sigyl.com>
Date: Wed, 18 Oct 2023 22:51:23 +0100
Subject: [PATCH] .

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

diff --git a/.drone.yml b/.drone.yml
index 6f4ca70..c45da8c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -22,7 +22,7 @@ steps:
     - git pull origin master
     # - git branch -D product-development
     - git checkout -b product-development
-    - git merge --squash --no-commit --no-ff --strategy-option=theirs format-branch
+    - git merge --squash --no-commit --strategy-option=theirs format-branch
   environment:
     GIT_PASSWORD:
       from_secret: GIT_PASSWORD