Yeah, this is exactly right. I put up something on Github awhile back that compares different approaches in more detail, if anyone's interested: https://github.com/jiaweihli/git-workflow-strategies-example