haha

.drone.yml

@@ -23,8 +23,7 @@ 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