From e42144448757fb7734877c50fe185eb5877d3b78 Mon Sep 17 00:00:00 2001 From: Rowan Manning Date: Thu, 9 Jan 2014 10:36:08 +0000 Subject: [PATCH] Versioning clarifications --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6935412..5332264 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -36,12 +36,12 @@ Versioning We use [Semantic Versioning][semver] in this project. The process for releasing a new version is as follows; this should only be done by core contributors – you don't need to include a tagged version in your pull-requests. -* Merge the `develop` branch into `master` and switch to that branch +* Merge the `develop` branch into `master` and switch to `master` * Update the version number in `package.json` and `README.md` * Commit the changes with the message: "Version x.x.x" (x.x.x being the new version number) * Tag the commit with the version number (just the numbers, no "version" or "v") * Push with tags: `git push --tags` -* Check out the develop branch, merge master into it, and push +* Check out the `develop` branch, merge `master` into it, and push * On GitHub, add [release notes][release-notes] for the new version. The title should be "Version x.x.x", and the description should be a list of new features/fixes