Skip to content
Gordon Woodhull edited this page Jul 6, 2014 · 18 revisions

Because I always forget something...

  1. Update NEWS.md
  2. git flow release start N.N
  3. Update VERSION in the release branch to the current release version
  4. Update VERSION in the develop branch to the next release version +'-devel'
  5. Fix, fix...
  6. git flow release finish N.N
  7. git push from master and develop
  8. git push --tags

Notes:

  • We shouldn't maintain different versions of different files in different branches (except for VERSION itself). So, in particular, NEWS.md should just mention what version each feature/fix is targeted for, not what branch it was committed to.
  • Everything that gets committed to the release branch will get merged both to master and develop. In principle, master should always cleanly merge to develop (except for VERSION).