Merge pull request 'uuuuu' (#46) from product-development into master

Reviewed-on: #46

.drone.yml

@@ -11,6 +11,23 @@ clone:
   disable: false
 
 steps:
+- name: "git - pre format"
+  when:
+    branch:
+    - format-branch
+  image: alpine/git:latest
+  commands:
+    - 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 checkout product-development
+    - merge --squash --no-commit --no-ff --strategyoption=theirs format-branch
+  environment:
+    GIT_PASSWORD:
+      from_secret: GIT_PASSWORD
+    GIT_USER:
+      from_secret: GIT_USER
 - name: "convert to xml"
   image: sigyl/zone-10-batch2yaml:latest
   when:
@@ -25,7 +42,7 @@ steps:
   image: sigyl/zone-10-batch2yaml:latest
   when:
     branch:
-    - deployed
+    - format-branch
   commands:
     - node /app/servers/apps/batch2yaml/build/index.js . yml
   volumes:
@@ -60,7 +77,7 @@ steps:
 - name: "git - product-development"
   when:
     branch:
-    - deployed
+    - format-branch
   image: alpine/git:latest
   commands:
     - git config credential.helper '!f() { sleep 1; echo "username=$${GIT_USER}"; echo "password=$${GIT_PASSWORD}"; }; f'
@@ -100,7 +117,7 @@ volumes:
 
 trigger:
   branch:
-  - deployed
+  - format-branch
   - master
   event:
   - push