You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Corinne Lucas edited this page Feb 19, 2025
·
3 revisions
Immediate bug fixes are handled in their own release using hotfixes.
Once there is a proposed hotfix
Pull request is submitted
Tests pass
PR review conducted by another developer
When the reviewer is satisfied, the merge is approved:
The following steps use git flow to merge all the code into develop and master branches. Make sure you are up to date with develop and master locally for a smooth deploy.
Checkout the hotfix/[hotfix name] branch.
Run git flow hotfix finish [hotfix name]
Once the merges are in order, make sure you are on the develop branch
Run git push origin develop --follow-tags
Confirm that the apps are up and running successfully on the dev sites.
Test the site in the develop environment
Once the dev site is good, push to production via git flow and travis
Switch to the master branch
Run git push origin master --follow-tags
Confirm that the apps are up and running successfully on the dev sites.