Skip to content

Commit

Permalink
Clarify the use of still branch in CONTRIBUTING-guide
Browse files Browse the repository at this point in the history
  • Loading branch information
maxmeyer committed May 7, 2016
1 parent 342ac6f commit 7cd66b3
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down

0 comments on commit 7cd66b3

Please sign in to comment.