From a4600dc99a6f9f3c5db2850ff5a6dba1a8386936 Mon Sep 17 00:00:00 2001 From: giles Date: Wed, 18 Oct 2023 22:50:53 +0100 Subject: [PATCH] . --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index e64677d..6f4ca70 100644 --- a/.drone.yml +++ b/.drone.yml @@ -22,7 +22,7 @@ steps: - git pull origin master # - git branch -D product-development - git checkout -b product-development - - git merge --squash --no-commit --no-ff --strategyoption=theirs format-branch + - git merge --squash --no-commit --no-ff --strategy-option=theirs format-branch environment: GIT_PASSWORD: from_secret: GIT_PASSWORD