99

Reviewed-on: #55

.drone.yml

@@ -18,12 +18,19 @@ steps:
   image: alpine/git:latest
   commands:
     - git config credential.helper '!f() { sleep 1; echo "username=$${GIT_USER}"; echo "password=$${GIT_PASSWORD}"; }; f'
+    - git log -n 1
     - git checkout -b 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 merge --squash --no-commit --strategy-option=theirs format-branch
+    - git log -n 1
+    - git checkout format-branch **/*.* 
+    - git status
+    - git log -n 1
   environment:
     GIT_PASSWORD:
       from_secret: GIT_PASSWORD
@@ -101,7 +108,7 @@ steps:
     - 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 HEAD:product-development
+    - git push -f origin HEAD:product-development
   environment:
     GIT_PASSWORD:
       from_secret: GIT_PASSWORD