We currently have three distinct development stages.
- Dev: for integrating features under development
- Testing: for testing complete features
- Master: for tested features
If your changes are significant then make a new branch that is named after the Jira issue, in the format SOFTWARE-XXX-brief-description
E.g. SOFTWARE-753-boxes2headings
- Create a topic branch from where you want to base your work.
- This is usually the master branch.
- To quickly create a topic branch based on master;
git checkout -b fix/master/my_contribution master. Please avoid working directly on themasterbranch.
- Make commits of logical units.
- Check for unnecessary whitespace with
git diff --checkbefore committing. - Make sure your commit messages are accurate and coherent.