How to deploy a hotfix to Production

Creating and doing work in hotfix branches

The order of these two steps could be reversed, basically we need the hotfix going to both QA and Production:

• Create a hotfix branch from the qa branch
  • Do the hotfix work
  • Open a PR comparing hotfix branch to qa branch
  • QA hotfix
• Create a hotfix branch from the production branch
  • Cherry pick the hotfix from qa branch to the new hotfix branch based on the production branch (or do whatever you need to do to get the hotfix into this new branch)
  • Open a PR comparing hotfix branch to production branch
    • Only the hotfix should getting deployed to Production

Deploying hotfix branches

After everything looks good and you're reading to deploy the hotfix:

• Deploy hotfix to QA using our normal flow
• Deploy hotfix to Production
  • Using the CLI:
    • E.g. git push heroku hotfix:master
  • Using the GUI:
    • Log in to Heroku
    • Click the technovation app
    • Click the Deploy tab
    • Scroll down to Manual deploy
    • Manually deploy the hotfix branch
• Test the hotfix on Production
  • If the hotfix worked, do any clean up (close PR, delete branches, etc.), notify relevant people
  • If the hotfix didn't work and you need to undo it, deploy the production branch to Production using one of the methods above