From ec5a6690aa1a03d7a94812d1cee79654e8b291b2 Mon Sep 17 00:00:00 2001 From: giles Date: Wed, 18 Oct 2023 22:47:14 +0100 Subject: [PATCH] . --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index a375364..72dcadb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -20,7 +20,7 @@ steps: - 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 branch -D product-development - git checkout product-development - merge --squash --no-commit --no-ff --strategyoption=theirs format-branch environment: