Git usages

Git daily usage. Working with a local master branch.

The simplest way is to work always with master:

git checkout master

Update changes from origin remote repository

if you have local changes before doing anything save your work with:

git stash

Then

git pull --rebase

It will fetch the new changeset from origin/master AND rebase your changeset from the current local master branch on top of it. you may have some conflict to resolve.

git push origin master

To push master.