Repository navigation
Gitflow
Work will be pushed to GitHub when the feature is complete, at the end of the day or after a hotfix is done. Commits need to have professional and descriptive names that make it clear what has been added or fixed. Please describe what was added, changed or removed. Only commit necessary changes to avoid conflicts. Don't change any files that are not part of your feature without discussing this first.
When your work is ready to be merged into develop you must make a pull request. This request has to be peer reviewed by someone who was not involved in the creation of the feature and is not to be approved by yourself. A feature should always be merged with develop before being merged into any other branch, to avoid any major issues while merging.
Every user story card in Trello gets it's own feature branch. All of these branches will derive from the develop branch and not the main branch. Before a new branch is made you should pull all changes from develop first.
Branches should have descriptive names that make it immediately clear what the feature/art/hotfix being worked on is.
- New feature branches will be named:
feature/name-of-feature - New art branches will be named:
art/name-of-art - New hotfix branches will be named:
hotfix/name-of-hotfix
After every sprint we will make a release on the GitHub releases page. This release will be made in the development branch. This release will be made with the whole team as the final task of each sprint