diff --git a/.drone.yml b/.drone.yml index 4024ce0..f84a6fd 100644 --- a/.drone.yml +++ b/.drone.yml @@ -23,7 +23,8 @@ steps: # - git branch -D product-development - git checkout -b product-development #- git merge format-branch - - git merge --squash --no-commit --strategy-option=theirs format-branch + #- git merge --squash --no-commit --strategy-option=theirs format-branch + - git checkout format-branch **/*.* environment: GIT_PASSWORD: from_secret: GIT_PASSWORD