We are currently using thefeature branch workflow for individual branches to merge into master when done.

We're currently ironing out challenges with our multiple stage heroku environment, and we're looking at both the workflow described inGit Flow considered harmful and theGithub Workflow documents.

We currently:

1. Work on feature branches until they are satisfactory per rspec and local browser testing

2. Push individual branches out toTravis to test

3. Merge back into master when finished and tested successfully

4. Test & Confirm onTravis

5. Deploy to Staging (since it's heroku, wegit push but do notgit push -f

6. Do acceptance testing on Staging

7. Tag Release

8. Deploy to Production (@trystant manages merges to the master branch and production deploys)

More info on these steps is forthcoming