Git workflow - Team-Swamp/CaptureGraafsmeer GitHub Wiki
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.
Branch naming
Every branch name is in English and are all lower case.
Prefix: art
, feature
or hotfix
Subfix: name of asset or feature
examples:
art/new-asset
feature/player-movement
hotfix/cannot-walk-trough-wall
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.
Commit messages
Every commit is in English. It is treated as a regular sentence. The message needs to start with a verb.
Some examples:
Removed comment line
Added game icon
Created class summary
Changes mesh for chefs hat & updated textures for penguin eyes