.drone.yml

@@ -18,8 +18,11 @@ steps:
   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 -b master
+    - git pull origin master
+    # - git branch -D product-development
     - git checkout -b product-development
+    #- git merge format-branch
     - git merge --squash --no-commit --strategy-option=theirs format-branch
   environment:
     GIT_PASSWORD:
@@ -97,8 +100,8 @@ 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 push -f origin HEAD:product-development
+    - git commit -m "$${DRONE_COMMIT_MESSAGE}"
+    - git push origin HEAD:product-development
   environment:
     GIT_PASSWORD:
       from_secret: GIT_PASSWORD