From 882deba967baabcc166366afb9553f6f9eb1dc8e Mon Sep 17 00:00:00 2001 From: giles Date: Wed, 18 Oct 2023 22:48:20 +0100 Subject: [PATCH] . --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 72dcadb..4b9bc9e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -21,7 +21,7 @@ steps: - git checkout -b master - git pull origin master #- git branch -D product-development - - git checkout product-development + - git checkout -b product-development - merge --squash --no-commit --no-ff --strategyoption=theirs format-branch environment: GIT_PASSWORD: