Branching process
Here's how branches should be handled (this is similar to GitHub Flow):
Master Branch (https://github.com/CS-Worcester/CS401Spring2013) This is the deployable version of the site. Nothing makes it into this branch without testing. If you have a commit that you would like to be put into the master branch:
-
Create a pull request from the Development Branch to the Master Branch
-
Someone will test and review your code.
-
Once the code passes, the pull request will be approved, and you changes will be merged into the Master Branch.
Development Branch (https://github.com/CS-Worcester/CS401Spring2013/tree/development) This is the testing version of the site. If you have new code that you want to test within the context of the full site, merge your changes into this branch and test.
Development of individual features and spike solutions should happen in their own branches.
This text is available under the Creative Commons Attribution-ShareAlike License.
By making changes to this page, you irrevocably agree to release your contribution under the CC-BY-SA 3.0 License.