staging would fit well within the work flow outlined above: you just branch out a staging branch, and export that. If the client needs any fixes, you fix it on

staging would fit well within the work flow outlined above: you just branch out a staging branch, and export that. If the client needs any fixes, you fix it on the stating branch, and merge it back to master. That way, further development on master won't disturb staging. Once the client is happy, tag staging and export it to production.