Repository Organization
###Branches### We will be following a simplified version of this model: http://nvie.com/posts/a-successful-git-branching-model/
-
master (permanent)
Main branch, code here always reflects a production-ready state (e.g. milestone builds). There should be no direct commits to this branch. It should only be merged from develop. -
develop (permanent)
Develop branch, code here reflects the project with the latest developmental changes (e.g. nightly builds). There should be no direct commits to this branch. It should only be merged from our individual development branches. -
james-dev & jon-dev (permanent)
Individual branches where we will work on specific features and push commits of our work in progress. When a feature is finished, it can be merged into the develop branch. -
hotfix branches (temporary)
Only needed if a problem is discovered in develop or master that needs an immediate fix. After the fix is implemented and merged, the branch can be deleted.
This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License.
