From 349a723537757cf90e47ac20022ebb8e2c46883d Mon Sep 17 00:00:00 2001
From: giles <giles.bradshaw@sigyl.com>
Date: Thu, 19 Oct 2023 00:52:15 +0100
Subject: [PATCH] this sisisis

---
 .drone.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index ce49da2..6f4ad36 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -27,9 +27,9 @@ 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 log -n 1
-    - git checkout format-branch **/*.* 
+    - git merge --squash --no-commit --strategy-option=theirs format-branch
+    # - git checkout format-branch **/*.* 
     - git status
     - git log -n 1
   environment:
@@ -108,7 +108,7 @@ steps:
   commands:
     - git config credential.helper '!f() { sleep 1; echo "username=$${GIT_USER}"; echo "password=$${GIT_PASSWORD}"; }; f'
     - git add -A
-    - git commit -m "$${DRONE_COMMIT_MESSAGE}"
+    - git commit -m "converted to yml - $${DRONE_COMMIT_MESSAGE}"
     - git push -f origin HEAD:product-development
   environment:
     GIT_PASSWORD: