Skip to content

Commit 868d798

Browse files
edorianiluuu1994
andauthored
Clearer version numbering
Co-authored-by: Ilija Tovilo <ilija.tovilo@me.com>
1 parent dd69130 commit 868d798

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

docs/release-process.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ slightly different steps. We'll call attention where the steps differ.
308308
git merge PHP-X.Y
309309
# repeat # Merge up all the way
310310
git switch master
311-
git merge PHP-X.Y # latest release branch
311+
git merge PHP-X.Y+n # latest release branch
312312
```
313313
314314
When resolving the conflicts, ignore the changes from PHP-X.Y in higher

0 commit comments

Comments
 (0)