Use Buildmeister! My co-worker wrote a cool little tool wrapping this common workflow up so you can have single line deploys to staging that merge bug/feature branches.

http://leigh.onehub.com/buildmeister-talk