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

---
 .drone.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 891eaa7..6464cdf 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -17,12 +17,12 @@ steps:
     - format-branch
   image: alpine/git:latest
   commands:
-    - git config credential.helper '!f() { sleep 1; echo "username=$${GIT_USER}"; echo "password=$${GIT_PASSWORD}"; }; f'
-    - git checkout -b master
-    - git pull origin master
+    #- git config credential.helper '!f() { sleep 1; echo "username=$${GIT_USER}"; echo "password=$${GIT_PASSWORD}"; }; f'
+    #- git checkout -b master
+    #- git pull origin master
     # - git branch -D product-development
     - git checkout -b product-development
-    - git merge --squash --no-commit --strategy-option=theirs format-branch
+    #- git merge --squash --no-commit --strategy-option=theirs format-branch
   environment:
     GIT_PASSWORD:
       from_secret: GIT_PASSWORD