| 51 | === Repository === |
| 52 | A separate repo has been created:[[br]] |
| 53 | https://github.com/edengci/eden |
| 54 | |
| 55 | === Branches === |
| 56 | We can retain the master branch as a mirror of the main (trunk) repository -- it won't be otherwise involved in the GCI workflow. |
| 57 | |
| 58 | Branch "base" is a temporarily frozen revision level that is used to set up new student branches. |
| 59 | |
| 60 | Branch "staging" is the destination for student work. After a student's work is accepted, it is merged into the staging branch. |
| 61 | |
| 62 | Each student has a branch that is used for code reviews. The purpose of separate branches is so the target branch won't change during the code review. |
| 63 | If we find that this is not a problem, or if we want students to have the experience of fixing up conflicts (with other students' work) then we can |
| 64 | dispense with student branches, and have them do PRs directly to the staging branch. |
| 65 | |
| 66 | Periodically, we will update the base branch to current trunk, rename the staging branch to "to_trunk", and make a new staging branch at the |
| 67 | same revision as the base branch. |