I\'m using git, and I\'m setting up the following branches to support my workflow:
You might want to check out Git flow for some more ideas about this kind of workflow.