push basics

== Assume you are working on branch called "mytestbranch" and now you want to commit
$ git add .
$ git commit -m "My commit message"
$ git checkout master
$ git merge mytestbranch
$ git pull --rebase
== if conflict, 
      == resolve conflict:
      $ git add .
      $ git rebase --continue
== end conflict resolve
$ git push
$ git checkout "mynewbranch"