...
Tag a release. This may either be a release candidate or a final release. For example:
Code Block language bash $ git tag -a 0.1.0-rc1 -m "Spin 1, Release Candidate 1" $ git tag -a 0.1.0 -m "Spin 1, Final Release"
Remember to push the tag:
Code Block language bash $ git push --tags origin
Create a new branch for the next spin
Code Block language bash $ git branch 0.2.0 $ git push origin 0.2.0
- Change the default branch to the new branch in the Stash Daffodil Repo Settings.
From this point on, all new features are to be added to the new branch (e.g. 0.2.0
) following the Development Workflow. All tests and bug fixes for the previous spin should be performed on the previous branch and merged into the new branch:
Code Block | ||
---|---|---|
| ||
$ git checkout 0.1.0 # fix bug and/or add test verifying bug fix, commit and push changes $ git checkout 0.2.0 $ git merge 0.1.0 |