]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
Doc: fix missing merge on Release page 1639/head
authorArthurHoaro <arthur@hoa.ro>
Thu, 12 Nov 2020 12:16:20 +0000 (13:16 +0100)
committerArthurHoaro <arthur@hoa.ro>
Thu, 12 Nov 2020 12:16:20 +0000 (13:16 +0100)
doc/md/dev/Release-Shaarli.md

index 2c77240678329448dd22e3fdfddccd3be857cc3a..d79be9ce67d39bde0ffba2da36b51a3642d72af2 100644 (file)
@@ -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