diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 4299051..2352b8f 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -41,7 +41,7 @@ but I cannot be bothered rn | main | protected branch which all machines pull from, do not try to push directly | | feature/\ | \ is a new feature being added to the repo, for personal or common use | | fixup/\ | \ is a non-urgent bug, PRs merging from these branches should be merged when possible, but are not considered mission-critical | -| hotfix/\ | \ is a mission-critical bug, either affecting all users or a breaking change on a user's machines. These PRs should be reviewed ASAP | +| hotfix/\ | \ is a mission-critical bug, either affecting all users or a breaking change on a user's machines. These PRs should be reviewed ASAP. This is automatically subject to the [Critical Issues](#critical-issues) process | | urgent/\ | Accepted as an alias for the above, due to dev's coming from multiple standards and the criticality of these issues | | exp/\ | \ is a non-critical experiment. This is used for shipping around potential new features or fixes to multiple branches | | merge/\ | \ is a temporary branch and should never be merged directly to main. This is solely used for addressing merge conflicts which are too complex to be merged directly on branch |