Skip to content

Conversation

@DanielEScherzer
Copy link
Member

  • Add PHP 8.5 release schedule link
  • Note that the patch-level branch for PHP X.Y.0 is created as part of the last planned release candidate
  • Clarify when patch-level branches are pushed
  • Add a hint about the values for API versions

* Add PHP 8.5 release schedule link
* Note that the patch-level branch for PHP X.Y.0 is created as part of the last
planned release candidate
* Clarify when patch-level branches are pushed
* Add a hint about the values for API versions
@DanielEScherzer
Copy link
Member Author

Cross link #19948 (not something the RMs can necessarily always do) and #19982 (which we should be able to do)

> 💬 **Hint** \
> The *patch-level version branch* for GA (PHP X.Y.0) is created as part of the
> last *planned* RC release (currently PHP X.Y.0RC4). After the last RC is released
> additional bug fixes in the branch will not be a part of PHP X.Y.0. If a regression
Copy link
Member

@edorian edorian Oct 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the branch

referring to 8.5 not the 8.5.0 mentioned from above. Maybe clarify?

Do not forget to merge up PHP-X.Y all the way to master. When resolving
the conflicts, ignore the changes from PHP-X.Y in higher branches. It
means using something like `git checkout --ours .` when on PHP.X.Y+1 or
master after the merge resulting in the conflicts.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe this could use an example and maybe a reminder to set up merge.NEWS from https://wiki.php.net/vcs/gitfaq ?

Copy link
Member

@NattyNarwhal NattyNarwhal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I remember the bit about the last RC being confusing last cycle; I think this clarifies this well.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants