....

.drone.yml

@@ -86,6 +86,17 @@ steps:
     - git fetch
     - git checkout deployed
     - git merge master
+- name: "check out product-development"
+  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 fetch
+    - git checkout product-development
+    - git merge format-branch
+
 - name: "convert to xml"
   image: sigyl/zone-10-batch2yaml:latest
   when:
@@ -114,6 +125,7 @@ steps:
   image: alpine/git:latest
   commands:
     - git config credential.helper '!f() { sleep 1; echo "username=${GIT_USER}"; echo "password=${GIT_PASSWORD}"; }; f'
+    - git add -A
     - git commit -m '$${DRONE_COMMIT_MESSAGE}'
     - git push origin
   volumes: