Changes between Version 3 and Version 4 of DeveloperGuidelines/Git/GCI


Ignore:
Timestamp:
12/04/14 16:23:19 (7 years ago)
Author:
Pat Tressel
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • DeveloperGuidelines/Git/GCI

    v3 v4  
    4949== Setup ==
    5050
     51=== Repository ===
     52A separate repo has been created:[[br]]
     53https://github.com/edengci/eden
     54
     55=== Branches ===
     56We can retain the master branch as a mirror of the main (trunk) repository -- it won't be otherwise involved in the GCI workflow.
     57
     58Branch "base" is a temporarily frozen revision level that is used to set up new student branches.
     59
     60Branch "staging" is the destination for student work. After a student's work is accepted, it is merged into the staging branch.
     61
     62Each 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.
     63If 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
     64dispense with student branches, and have them do PRs directly to the staging branch.
     65
     66Periodically, we will update the base branch to current trunk, rename the staging branch to "to_trunk", and make a new staging branch at the
     67same revision as the base branch.
    5168== Mentor Workflow ==
    5269