1 changed files with 2 additions and 2 deletions
--- 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 --strategy-option=theirs format-branch
+    - merge --squash --no-commit --no-ff --strategyoption=theirs format-branch
  environment:
    GIT_PASSWORD:
      from_secret: GIT_PASSWORD