GIT basic commands

• Get initial clone ->  git clone git@github.com/aporter/coursera-android.git
• git push origin master

Git Merge

-------------

• Do you changes in a different branch "my_dev"
• After completing the work there commit all the changes on that branch "my_dev"
• Checkout to master and get rebase. -> git checkout dev -> git pull --rebase dev.
• Now rebase "my_dev" with dev -> git checkout my_dev-> git rebase  dev.
• See for conflict
• Checkout to master -> git checkout dev
• Merge your branch -> git merge my_dev
• See for conflicts, push otherwise. -> git push