Dominic Humphries:

Back to my mantra: This is git. Branches are cheap. Merging is easy. You are not using enough branches.