Git Etiquette - Richardng12/Terra_Tales GitHub Wiki

master

The master branch is for the final stable build used for submission. The build should not contain any game-breaking bugs and should not break the build.

premaster

The premaster branch is for the development of the game where we merge features. All other branches should branch out of premaster and then merged back in during development.

feature/featureName

The feature folder contains branches which are branched out of premaster. This branch is used when a new feature is needed to be implemented and then should be merged back into premaster.

hotfix/issueName

The hotfix folder is used when a bug is discovered either on the feature branch or the premaster branch (note master shouldn't have any bugs). This branch should be branched of either feature or premaster and then be merged back into the respective branch.

pull requests

Once a feature is completed a pull request is made to merge it into premaster or any of the other requested branches