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

Timestamp:

12/04/14 13:12:53 (10 years ago)

Author:

Pat Tressel

Comment:

--

DeveloperGuidelines/Git/GCI

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