Our Git process - acodeguy/acebook-rails-gang-of-four GitHub Wiki

We have created a staging branch from master. For each piece of work (e.g. development of a feature), we create a branch from staging. When the feature branch is at a point where something can be pushed up, we start by merging the latest changes in staging into the feature branch and running our tests. We then merge up to staging via a pull request.

Once there is enough functionality in staging to justify a new release (e.g. both the registration and login features have been completed), we create a pull request to merge to master, which is code reviewed before the merge is done.

Travis CI runs on the pull requests into master automatically. If the tests and build passes, only then will it deploy to the production environment on Heroku.

https://drive.google.com/open?id=1X9Sf0tleT514bOru81pi-7PnDUDLTc0V

https://drive.google.com/file/d/1idMNek6sC_sxuvNKjPi9OyMP4XwPv63p/view?usp=sharing