Skip to content

Commit dd69130

Browse files
committed
Release Process: Add commands for merge up
As we list all other commands to run, this was added for consistency
1 parent 7f7238e commit dd69130

1 file changed

Lines changed: 13 additions & 4 deletions

File tree

docs/release-process.md

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -301,10 +301,19 @@ slightly different steps. We'll call attention where the steps differ.
301301
> Only release tags should have version numbers in these files that do not
302302
> end in `-dev` (e.g., `8.1.7`, `8.1.7RC1`, `8.2.0alpha1`, etc.).
303303
304-
Do not forget to merge up PHP-X.Y all the way to master. When resolving
305-
the conflicts, ignore the changes from PHP-X.Y in higher branches. It
306-
means using something like `git checkout --ours .` when on PHP.X.Y+1 or
307-
master after the merge resulting in the conflicts.
304+
Do not forget to merge up PHP-X.Y all the way to master.
305+
306+
```shell
307+
git switch PHP-X.Y+1 # starting from your release branch
308+
git merge PHP-X.Y
309+
# repeat # Merge up all the way
310+
git switch master
311+
git merge PHP-X.Y # latest release branch
312+
```
313+
314+
When resolving the conflicts, ignore the changes from PHP-X.Y in higher
315+
branches. It means using something like `git checkout --ours .` when on
316+
PHP.X.Y+1 or master after the merge resulting in the conflicts.
308317
309318
Be sure to set up a merge driver for the NEWS file as described in
310319
the [Git FAQ page on the PHP wiki][gitfaq-mandatory].

0 commit comments

Comments
 (0)