Git workflow

Workflow

Pull latest version of develop
Make a new branch, examples
Make your commits
Make a pull request
- Need help? check this page
Pull newest version of develop
- For the new stuff that has been added
Merge if pull request is approved
- Approving is done by the lead artist, lead developer or git master
The creator of the pull request will merge it.

Every branch name is in English and are all lower case.
Prefix: art, feature or hotfix
Subfix: name of asset or feature examples:

For readme.md updates you need to name the branch like this: readme/patch-X; X is standing for the revision of the readme files.

Every commit is in English. It is treated as a regular sentence. The message needs to start with a verb.

Some examples:

Links	Description
What-is-made	Here is a list of the team members with their roles and what they have made
Asset Naming Conventions	An in depth convention for naming files
Code Convention	A code convention used for this project
Definition of done	When is something done? Here's a list of criteria of the definition of done.
Functional Design	A description about how to play the game
Git workflow	This is our git workflow, with branch naming
Scrum	A page with all our scrum notes and files
Software in use	Here's a list of the software we use to make this project
Technical Design	An in depth explanation of how complex systems work in the game
Full code documentation	The full documentation of each feature and class
User testing	User testing video's of the game