There are a lot of good Git workflow patterns here.