git workflow - Zan4567/Alexa_Adventures GitHub Wiki

Merges will have to be approved by the other three team members, known as 'Alphas'. An Alpha will never merge their own branch. Instead, another Alpha will perform the merge after reviewing the code. Alphas will write code on separate feature branches. When a feature is complete, it will be merged into a central Development branch. The Development branch will only be merged back to master when it is thoroughly tested and ready for deployment.

Branches will have appropriate prefixes describing what type of branch they are. Feature branches will be prefixed with 'feature-', bugfixing branches with 'bugfix-', and any other type will be given an appropriate prefix.