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
Copy file name to clipboardExpand all lines: DEVELOPMENT.md
+24Lines changed: 24 additions & 0 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -72,6 +72,30 @@ You may need to make changes to a pre-release prior to publishing a final stable
72
72
73
73
Hotfix releases follow the same process as standard releases above, but the `release-next` branch should be branched off latest `main` instead of `dev`. Once the stable hotfix is published, the `release-next` branch should be merged back into both `main` and `dev` just like a normal release.
74
74
75
+
### 6.x releases from the `v6` branch
76
+
77
+
After the `6.25.0` release, we branched off a `v6` branch for continued `6.x` work and merged the `v7` branch into `dev` to begin preparation for the `7.0.0` release. Until we launch `7.0.0`, we need to `6.x` releases in a slightly different manner.
78
+
79
+
- Changes for 6.x should be PR'd to the `v6` branch with a changeset
80
+
- Once merged, cherry-pick or re-do those changes against the `dev` branch so that they show up in v7
81
+
- This does not apply to things like adding deprecation warnings that should not land in v7
82
+
- You should not include a changelog in your commit to `dev`
83
+
- Starting the release process for 6.x is the same as outlined above, with a few changes:
84
+
- Branch from `v6` instead of `dev`
85
+
- Do not merge `main` into the `release-*` branch
86
+
- The process of the PRs and iterating on prereleases remains the same
87
+
- Once the stable release is out:
88
+
- Merge `release-next` back to `v6` with a **Normal Merge**
- If one or more are not, then you can manually bring them over by cherry-picking the commit (or re-doing the work)
96
+
- You should not include a changelog in your commit to `dev`
97
+
- Copy the updated changelogs from `release-next` over to `dev` so the changelogs continue to reflect this new 6x release into the v7 releases
98
+
75
99
### Experimental releases
76
100
77
101
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.
0 commit comments