heroku-prodfix

# Checkout
git tag                               # List tagged versions
git checkout -b prodfix <version>     # Checkout specific version into prodfix branch

# Fix code and commit

# Test in staging (requires compatible database state)
git push staging +HEAD:master         # Push to staging

# Put in producton
git push production +HEAD:master      # Push to production

git tag -a v<VERSION> -m "v<VERSION> <Comment>" # Create a tag for latest version
git push --tags origin                # Push tags to github

# Merge with master
git checkout master                 
git merge prodfix
git push origin master
git push staging master