Changes between Version 8 and Version 9 of DeveloperGuidelines/Git/GCI
- Timestamp:
- 12/06/14 03:38:08 (10 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
DeveloperGuidelines/Git/GCI
v8 v9 64 64 65 65 === Branches === 66 Branch "base" is a temporarily frozen revision level that is used to set up new student branches.66 Branch "base" is a temporarily frozen revision level that is used only to record the revision after which the staging branch diverged from the main repo. 67 67 68 Branch "staging" is the destination for student work.68 Branch "staging" is the branch students should pull, to get a local branch for new tasks, and is the destination for student pull requests. 69 69 70 Both are initially set to the same revision as master in the main repository.70 Both will be periodically set to the same revision as master in the main repository. 71 71 72 72 == Mentor Workflow ==