From 831e974ea5fa93d689e65313f84d0c80999674c3 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Thu, 12 Nov 2020 13:16:20 +0100 Subject: Doc: fix missing merge on Release page --- doc/md/dev/Release-Shaarli.md | 8 ++++++++ 1 file changed, 8 insertions(+) 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 # 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 -- cgit v1.2.3