- Create a commit that bumps the version number in
config/application.rb
to a semver-appropriate higher level, ondevelopment
. git tag
this commit using a command likegit tag v[$YOUR_VERSION]
, likegit tag v1.6.3
. You can attach a short changelog to the tag by including the output ofgit shortlog v[PREVIOUS]..HEAD
.- Push both the commit and the tag using
git push --follow-tags
. A changelog can be added by pasting the output ofgit shortlog $(git tag | tail -n1)..HEAD
. - Merge the commit to
master
using either a pull request or the terminal. This will always generate a merge commit because of previous merges using a merge commit (unlessmaster
gets merged intodevelopment
again. Ensure no actual differences exist betweenmaster
anddevelopment
by checking the (empty) output ofgit diff master..development
directly after merging. - Push if not pushed, and deploy if appropriate.