From 7cd66b3c56f5c0dd2cd05355717b9012ccffd71d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dennis=20G=C3=BCnnewig?= Date: Sat, 7 May 2016 14:04:27 +0200 Subject: [PATCH] Clarify the use of still branch in CONTRIBUTING-guide --- CONTRIBUTING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ff28cb25d..7f95a56b7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -134,6 +134,7 @@ gem 'byebug' * Bump the version number in `lib/aruba/version.rb` * Make sure `History.md` is updated with the upcoming version number, and has entries for all fixes. * No need to add a `History.md` header at this point - this should be done when a new change is made, later. +* If a major version is released, update the `still`-branch which points to "old" major version Now release it @@ -148,6 +149,7 @@ script/test git commit -m "Version bump" script/release +# If it's a major relase: # Merge changes back to have an correct documentation git checkout still git merge master