Git development model

Description: http://nvie.com/posts/a-successful-git-branching-model/

The above model has a git extension available: https://github.com/nvie/gitflow

About the extension: http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/

How to merge, fetch not pull: http://longair.net/blog/2009/04/16/git-fetch-and-merge/