diff --git a/.drone.yml b/.drone.yml index 4b9bc9e..e64677d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -20,9 +20,9 @@ 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 -b product-development - - merge --squash --no-commit --no-ff --strategyoption=theirs format-branch + - git merge --squash --no-commit --no-ff --strategyoption=theirs format-branch environment: GIT_PASSWORD: from_secret: GIT_PASSWORD