Repository management - hamstar/Braincase GitHub Wiki

Branches

Branches will be used for each sprint and for feature branches.

sprint1
sprint2
automatic-backup
logging

When you have finished working on a piece of functionality merge it with the sprint branch

git checkout -b logging     # create the branch
# ...edits and commit...
git checkout sprint1
git merge --no-ff logging   # enter a commit message when asked

When the sprint is finished you need to merge the sprint with the master branch:

git checkout master
git pull origin master
git merge --no-ff sprint1   # enter a commit message when asked

At the start of the next sprint you will need to create the new sprint branch with master as the base:

git checkout -b sprint2     # creates the sprint2 branch
git merge --no-ff master    # enter a commit message when asked

Tags

Tags should be used to track versions semantically. Typically we should tag when we have just generated a new package.

v0.1-alpha
v0.2.1
v0.5-beta
v0.5.3