- Merge the desired commits to master. But merge them cleanly! See: merging
- Edit and commit the version file in
lib/cloudformation-ruby-dsl/version.rb
. Bump the version based on the version specification git push
to origin/masterrake release
For this project, we will follow the methodology proposed by http://semver.org/spec/v2.0.0.html.
- Major versions break existing interfaces.
- Minor versions are additive only.
- Patch versions are for backward-compatible bug fixes.
When you use the shiny green "Merge" button on a pull request, github creates a separate commit for the merge (because of the use of the --no-ff
option). This is noisy and makes git history confusing. Instead of using the green merge button, merge the branch into master using git-land (or manually follow the steps described in the project).