converted to yml - ggg

.drone.yml

@@ -18,9 +18,20 @@ 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 fetch
+    #- 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 log -n 1
     - git merge --squash --no-commit --strategy-option=theirs format-branch
+    # - git checkout format-branch **/*.* 
+    - git status
+    - git log -n 1
   environment:
     GIT_PASSWORD:
       from_secret: GIT_PASSWORD