Home

Welcome to the SosIT18 wiki!
Here we write information which could be useful for other team members.

Feel free to add new pages with any info.

Our project is written in English, Java, HTML and sighs.

Naming branches

We have two main branches: master en develop.
On develop we merge working branches. One review is needed for the pull request. On master we merge when we bring out a release. A release has to be sufficiently tested and needs four reviews.

New branches start with a category. These are now:

• feature/ for working on new features.
• test/ for testing of code which doesn't need to be merged with develop.
• hotfix/ for making a small patch on the master or develop branch.

After the category comes the number sign, the number of the corresponding Trello card and an underscore.
Subsequently comes the title of the branch in UpperCamelCase. This names the feature you're about to write.
Example: feature/#32_NavbarJavaKlasse