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


Ignore:
Timestamp:
12/04/14 13:12:53 (7 years ago)
Author:
Pat Tressel
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • DeveloperGuidelines/Git/GCI

    v2 v3  
    44== Overview ==
    55
    6 In the past, we had students send pull requests directly to the main repository. This led to voluminous and frequent
     6''Once Upon a Time'', we had students send pull requests directly to the main repository. This led to voluminous and frequent
    77interruptions of the folks who approve submissions to the main repository. We would like to avoid this. Our intent is
    88to have mentors do complete code reviews of students' work, and assure that submissions work properly, pass tests,
     
    2020Students will still fork the main repository, looking forward to when they will (we hope) be contributing beyond GCI.
    2121However, during GCI, they will submit PRs to the GCI repository. In order to avoid chaos, we will temporarily freeze
    22 the revision level on which students will work -- we will provide a base branch that students will use to populate
     22the revision level on which students will work -- we will provide a ''base'' branch that students will use to populate
    2323their local working branch for GCI tasks. Students will each have their own branch in the GCI repository to send PRs to
    2424so reviews and merging of PRs for each student can be done asynchronously.
    2525
    26 We will also have a staging branch, initially set to the same revision as the base branch, onto which student work is
    27 aggregated. As mentors accept pull requests, they will merge them into the staging branch. If there is a conflict at
     26We will also have a ''staging'' branch, initially set to the same revision as the base branch, onto which student work
     27is aggregated. As mentors accept pull requests, they will merge them into the staging branch. If there is a conflict at
    2828this point, it will be with some other student's work, not with an update from the main repository. The mentor can
    2929resolve the conflict (which the student's assistance if needed).