From bbcb04b5a459010bd2f543c7d8a8d72864574dff Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Sun, 23 Nov 2014 14:14:38 +0100 Subject: [PATCH] update howto.mds procedure to release --- HOWTO.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/HOWTO.md b/HOWTO.md index 116ca78d..6dfa347e 100644 --- a/HOWTO.md +++ b/HOWTO.md @@ -2,10 +2,11 @@ ## Make a release 1. `make test-all` -2. merge into `stable` (from now on, proceed on branch `stable`) -3. update version in `_oasis` -4. `make update_next_tag` (to update `@since` comments) -5. update `CHANGELOG.md` (see its end to find the right git command) -6. commit, tag, and push both to github -7. new opam package +2. update version in `_oasis` +3. `make update_next_tag` (to update `@since` comments) +4. `git checkout stable` +5. `git merge master` +6. update `CHANGELOG.md` (see its end to find the right git command) +7. commit, tag, and push both to github +8. new opam package