Doc: fix missing merge on Release page
This commit is contained in:
parent
6f9e0609f4
commit
831e974ea5
1 changed files with 8 additions and 0 deletions
|
@ -64,6 +64,14 @@ git pull upstream master
|
|||
|
||||
# If releasing a new minor version, create a release branch
|
||||
$ git checkout -b v0.x
|
||||
# Otherwise just use the existing one
|
||||
$ git checkout v0.x
|
||||
|
||||
# Get the latest changes
|
||||
$ git merge master
|
||||
|
||||
# Check that everything went fine:
|
||||
$ make test
|
||||
|
||||
# Bump shaarli_version.php from dev to 0.x.0, **without the v**
|
||||
$ vim shaarli_version.php
|
||||
|
|
Loading…
Reference in a new issue