Update development docs for hotfixes

remix-run · Dec 5, 2022 · d8f364b · d8f364b
1 parent 19ee7f8
commit d8f364b
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
@@ -43,6 +43,10 @@ You may need to make changes to a pre-release prior to publishing a final stable
   - Convert the `[email protected]` tag to a Release on Github with the name `v6.x.y`
   - Copy the relevant changelog entries from all packages into the Release Notes and adjust accordingly, matching the format used by prior releases
 
+### Hotfix releases
+
+Hotfix releases follow the same process as standard releases above, but the `release-*` branch should be branched off latest `main` instead of `dev`. Once the stable hotfix is published, the `release-*` branch should be merged back into both `main` and `dev` just like a normal release.
+
 ### Experimental releases
 
 Experimental releases and hot-fixes do not need to be branched off of `dev`. Experimental releases can be branched from anywhere as they are not intended for general use.