Skip to content

Release Process: Add commands for merge up #22096

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
edorian wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −4
Open

Release Process: Add commands for merge up #22096

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions docs/release-process.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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].
Expand Down