In principle I agree w/ @creece. I have been in environments where it made more sense to use the flow @erictgrubaugh is suggesting too. I have found gitflow to be the most flexible strategy for most environments.