From afe5437268c6046053d8bc963cb031734beb702a Mon Sep 17 00:00:00 2001
From: giles <giles.bradshaw@sigyl.com>
Date: Thu, 19 Oct 2023 00:34:21 +0100
Subject: [PATCH] ahahah

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

diff --git a/.drone.yml b/.drone.yml
index 4024ce0..f84a6fd 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -23,7 +23,8 @@ steps:
     # - git branch -D product-development
     - git checkout -b product-development
     #- git merge format-branch
-    - git merge --squash --no-commit --strategy-option=theirs format-branch
+    #- git merge --squash --no-commit --strategy-option=theirs format-branch
+    - git checkout format-branch **/*.* 
   environment:
     GIT_PASSWORD:
       from_secret: GIT_PASSWORD