99

Reviewed-on: #55

.drone.yml

@@ -19,17 +19,16 @@ steps:
   commands:
     - git config credential.helper '!f() { sleep 1; echo "username=$${GIT_USER}"; echo "password=$${GIT_PASSWORD}"; }; f'
     - git log -n 1
-    - git fetch
+    - git checkout -b master
-    - git checkout master
     - git log -n 1
     - git pull origin master
     - git log -n 1
     # - 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 log -n 1
-    - git merge --squash --no-commit --strategy-option=theirs format-branch
+    - git checkout format-branch **/*.* 
-    # - git checkout format-branch **/*.* 
     - git status
     - git log -n 1
   environment:
@@ -108,7 +107,7 @@ steps:
   commands:
     - git config credential.helper '!f() { sleep 1; echo "username=$${GIT_USER}"; echo "password=$${GIT_PASSWORD}"; }; f'
     - git add -A
-    - git commit -m "converted to yml - $${DRONE_COMMIT_MESSAGE}"
+    - git commit -m "$${DRONE_COMMIT_MESSAGE}"
     - git push -f origin HEAD:product-development
   environment:
     GIT_PASSWORD: