From 15bcb91b9be4b78ffbb79cc4e8b12fb92b2df2ca Mon Sep 17 00:00:00 2001 From: Andreas Hocevar Date: Tue, 11 Feb 2020 16:29:01 +0100 Subject: [PATCH] Updated Release Procedure (markdown) --- Release-Procedure.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Release-Procedure.md b/Release-Procedure.md index 4a44eb4..7f2e6b2 100644 --- a/Release-Procedure.md +++ b/Release-Procedure.md @@ -65,11 +65,11 @@ Run the `publish.sh` task with the version number as specified in the `package.j ### Bump the patch version number -Check out master again: +This is to allow users to update to ol@dev seamlessly. Create a branch: - git checkout openlayers/master -b master + git checkout openlayers/master -b dev-3.1.1 -To allow updates to ol@dev, edit `package.json` and bump the patch version number, e.g. +edit `package.json` and bump the patch version number, e.g. ```json { "name": "openlayers", @@ -80,11 +80,12 @@ Propagate this change to `package-lock.json`: npm install -Commit and push this directly to master: +Commit and push this change: git add package.json package-lock.json git commit -m "Developing on 3.1.1" - git push openlayers master + +Create a pull request, review the changes, and merge the branch. ### Update website