aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2020-11-12 13:16:20 +0100
committerArthurHoaro <arthur@hoa.ro>2020-11-12 13:16:20 +0100
commit831e974ea5fa93d689e65313f84d0c80999674c3 (patch)
treef5ee10ec6c26dd80e505424346868ee524fb8aeb
parent6f9e0609f4c118142504234ebcc7d93456b5e588 (diff)
downloadShaarli-831e974ea5fa93d689e65313f84d0c80999674c3.tar.gz
Shaarli-831e974ea5fa93d689e65313f84d0c80999674c3.tar.zst
Shaarli-831e974ea5fa93d689e65313f84d0c80999674c3.zip
Doc: fix missing merge on Release page
-rw-r--r--doc/md/dev/Release-Shaarli.md8
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/md/dev/Release-Shaarli.md b/doc/md/dev/Release-Shaarli.md
index 2c772406..d79be9ce 100644
--- a/doc/md/dev/Release-Shaarli.md
+++ b/doc/md/dev/Release-Shaarli.md
@@ -64,6 +64,14 @@ git pull upstream master
64 64
65# If releasing a new minor version, create a release branch 65# If releasing a new minor version, create a release branch
66$ git checkout -b v0.x 66$ git checkout -b v0.x
67# Otherwise just use the existing one
68$ git checkout v0.x
69
70# Get the latest changes
71$ git merge master
72
73# Check that everything went fine:
74$ make test
67 75
68# Bump shaarli_version.php from dev to 0.x.0, **without the v** 76# Bump shaarli_version.php from dev to 0.x.0, **without the v**
69$ vim shaarli_version.php 77$ vim shaarli_version.php