For #1, we use Fourchette (https://github.com/jipiboily/fourchette), which means...

jipiboily on June 6, 2014 | parent | context | favorite | on: Version control: best practices

For #1, we use Fourchette (https://github.com/jipiboily/fourchette), which means we have a Heroku fork of our QA env for each GitHub PR.

For merges to master, we submit other pull requests that we call "Release: ...". We can then see if CI and Rainforest tests are passing, if all is green, then we merge! :)