Read “How I build a feature”

There are a lot of good Git workflow patterns here.