Git workflow - Team-Swamp/IceBites GitHub Wiki

Workflow

  1. Pull latest version of develop
  2. Make a new branch, examples
  3. Make your commits
  4. Make a pull request
  5. Pull newest version of develop
    • For the new stuff that has been added
  6. Merge if pull request is approved
    • Approving is done by the lead artist, lead developer or git master
  7. 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