-
-
Notifications
You must be signed in to change notification settings - Fork 5
Hotfix procedure
Nathaniel Paulus edited this page Jul 10, 2023
·
2 revisions
This is a general guideline but should be followed unless there's a good reason not to. If you find a serious bug on live that needs an immediate fix:
- Open a PR against master to fix the issue.
- Have the PR reviewed and merged (this process might be expedited, or in some cases marked as approved by the author).
- Create a new branch off of
sf-live
and chery-pick the commit from master usinggit cherry-pick -x <commit hash>
. The-x
causes Git to finish the commit message with(cherry picked from commit <commit hash>)
, making it easier to find the corresponding commit on the master branch. - Open a PR against
sf-live
and get it reviewed and merged. - Monitor the shipping process and make sure the site is working properly post shipping.
In some cases it may be necessary to ship a change to live first and then cherry-pick it to master. In this case the -x
should still be used so it's possible to tell that the commits are related.