This is how we do it. http://reinh.com/blog/2009/03/02/a-git-workflow-for-agile-te...