From dd69130ff3ced747d114d76b087a1b6b47742745 Mon Sep 17 00:00:00 2001 From: Volker Dusch Date: Tue, 19 May 2026 21:19:07 +0200 Subject: [PATCH 1/4] Release Process: Add commands for merge up As we list all other commands to run, this was added for consistency --- docs/release-process.md | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/docs/release-process.md b/docs/release-process.md index 7dd009676dd4..dd2571496b83 100644 --- a/docs/release-process.md +++ b/docs/release-process.md @@ -301,10 +301,19 @@ slightly different steps. We'll call attention where the steps differ. > Only release tags should have version numbers in these files that do not > end in `-dev` (e.g., `8.1.7`, `8.1.7RC1`, `8.2.0alpha1`, etc.). - 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. + Do not forget to merge up PHP-X.Y all the way to master. + + ```shell + git switch PHP-X.Y+1 # starting from your release branch + git merge PHP-X.Y + # repeat # Merge up all the way + git switch master + git merge PHP-X.Y # latest release branch + ``` + + 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. Be sure to set up a merge driver for the NEWS file as described in the [Git FAQ page on the PHP wiki][gitfaq-mandatory]. From 868d79800badd5d4ea1836eb2e5a36c3c1e263d1 Mon Sep 17 00:00:00 2001 From: Volker Dusch <247397+edorian@users.noreply.github.com> Date: Thu, 21 May 2026 13:24:30 +0200 Subject: [PATCH 2/4] Clearer version numbering Co-authored-by: Ilija Tovilo --- docs/release-process.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/release-process.md b/docs/release-process.md index dd2571496b83..a9b84cdd68c3 100644 --- a/docs/release-process.md +++ b/docs/release-process.md @@ -308,7 +308,7 @@ slightly different steps. We'll call attention where the steps differ. git merge PHP-X.Y # repeat # Merge up all the way git switch master - git merge PHP-X.Y # latest release branch + git merge PHP-X.Y+n # latest release branch ``` When resolving the conflicts, ignore the changes from PHP-X.Y in higher From 5068a193f83dac65d9eae211253529ae8bced3d2 Mon Sep 17 00:00:00 2001 From: Volker Dusch <247397+edorian@users.noreply.github.com> Date: Fri, 22 May 2026 01:20:35 +0200 Subject: [PATCH 3/4] Be explicit with the changes we ignore in merges --- docs/release-process.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/docs/release-process.md b/docs/release-process.md index a9b84cdd68c3..fecad08eb782 100644 --- a/docs/release-process.md +++ b/docs/release-process.md @@ -312,10 +312,16 @@ slightly different steps. We'll call attention where the steps differ. ``` 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. + branches when on PHP.X.Y+1 or master after the merge resulting in the + conflicts. - Be sure to set up a merge driver for the NEWS file as described in + ``` + git checkout --ours main/php_version.h Zend/zend.h configure.ac + git add main/php_version.h Zend/zend.h configure.ac + git merge --continue + ``` + + Be sure to set up a merge driver for the `NEWS` file as described in the [Git FAQ page on the PHP wiki][gitfaq-mandatory]. 11. Push the changes to the `php-src`. From e417dc93d17ab76b55caf2f857ca3cf1e934f41c Mon Sep 17 00:00:00 2001 From: Volker Dusch <247397+edorian@users.noreply.github.com> Date: Fri, 22 May 2026 01:21:46 +0200 Subject: [PATCH 4/4] Add code type --- docs/release-process.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/release-process.md b/docs/release-process.md index fecad08eb782..c07f328f2d8c 100644 --- a/docs/release-process.md +++ b/docs/release-process.md @@ -315,7 +315,7 @@ slightly different steps. We'll call attention where the steps differ. branches when on PHP.X.Y+1 or master after the merge resulting in the conflicts. - ``` + ```shell git checkout --ours main/php_version.h Zend/zend.h configure.ac git add main/php_version.h Zend/zend.h configure.ac git merge --continue