.

.drone.yml

@@ -22,8 +22,8 @@ steps:
     - git pull origin master
     # - git branch -D product-development
     - git checkout -b product-development
-    - git merge format-branch
+    #- git merge format-branch
-    #- git merge --squash --no-commit --strategy-option=theirs format-branch
+    - git merge --squash --no-commit --strategy-option=theirs format-branch
   environment:
     GIT_PASSWORD:
       from_secret: GIT_PASSWORD