@@ -121,15 +121,15 @@ slightly different steps. We'll call attention where the steps differ.
121
121
3 . Check out the * release branch* for this release from the * version branch* .
122
122
123
123
> 🔶 ** Non-stable version branches: pre-GA** \
124
- > There is no * version branch* for alpha releases. Instead, treat the main
125
- > branch as the version branch. You will create a local-only release branch
126
- > from the main branch. Do not push it!
124
+ > There is no * version branch* for alpha or beta releases. Instead, treat the
125
+ > main branch as the version branch. You will create a local-only release
126
+ > branch from the main branch. Do not push it!
127
127
>
128
128
> ``` shell
129
129
> git checkout -b php-X.Y.0alpha1-local-release-branch upstream/master
130
130
> ` ` `
131
131
>
132
- > During the first beta release, you will create (and push! ) the version
132
+ > During the first RC release, you will create (and push! ) the version
133
133
> branch for the pre-GA release, e.g., ` PHP-8.2` . See
134
134
> " [Forking a new version branch](#forking-a-new-version-branch)" below.
135
135
> From this point forward, all pre-GA release branches will be created from
@@ -845,16 +845,15 @@ recommendation and the intervals may vary based on work load.
845
845
846
846
## Forking a new version branch
847
847
848
- When the new version has reached the feature freeze point during its pre-release
849
- cycle, it is time to create a new version branch. This frees up the main branch
850
- (i.e., `master`) for any new feature development that cannot go into the new
851
- version.
848
+ When the new version has reached the first RC, it is time to create a new
849
+ version branch. This frees up the main branch (i.e., `master`) for any new
850
+ feature development that cannot go into the new version.
852
851
853
- 1. One week prior to tagging `X.Y.0beta1 `, warn internals@ that your version' s
852
+ 1. One week prior to tagging `X.Y.0RC1 `, warn internals@ that your version' s
854
853
branch is about to be created. Be specific about when the branch creation
855
854
will occur. For example: https://news-web.php.net/php.internals/99864
856
855
857
- 2. Just prior to tagging ` X.Y.0beta1 ` , create the new version branch locally,
856
+ 2. Just prior to tagging ` X.Y.0RC1 ` , create the new version branch locally,
858
857
i.e. ` PHP-X.Y` .
859
858
860
859
3. Add a commit on the main branch (i.e., ` master` ) after the branch point.
@@ -885,6 +884,13 @@ version.
885
884
* [Add PHP-8.1 to the Git steps page][]
886
885
* [Changes to the wiki][]
887
886
887
+ > 💬 ** Hint** \
888
+ > We create the new version branch at the first release candidate rather than at
889
+ > feature freeze to allow a period of time where the focus is on making the new
890
+ > version ready for RC and GA. During this time, the main branch is * only* for
891
+ > minor improvements and bug fixes. All major improvements and new features must
892
+ > wait.
893
+
888
894
889
895
# # Preparing for the initial stable version (PHP X.Y.0)
890
896
0 commit comments