Git workflow

8 Aug 2012

Normally, I'm using 3 branches, which are `stable, ``staging`, andmaster``.

When you want to make a big change, please branch from `staging` by:

Let's assume you have made the change (commit and everything). Now you should merge it into `staging` with:

Now here is the normal commit flow:

Please note that `git pull origin <branch>` in order to pull the changes from the server