RT danielmall: The GIt branching workflow I mentioned earlier, made simple by skoch and snorpey: skoch.github.com/Git-Workflow/