Changes between Version 7 and Version 8 of DeveloperGuidelines/Git/GCI

Timestamp:

12/05/14 22:34:19 (10 years ago)

Author:

Pat Tressel

Comment:

--

DeveloperGuidelines/Git/GCI

@@ -77 +77 @@
 == Student Workflow ==
 
+=== Normal process ===
+
 We will be using a !GitHub repository just for GCI, rather than submitting code directly to the main repository.
 This will help us conserve the time of the (very busy) folks who have to approve submissions to the main repository.
@@ -132 +134 @@
 * Create the pull request.
 * Continue with the code review as usual.
+
+=== Aggregation cycle ===
+
+Every few days, we will send your completed work to the main repository. In order to do this, we will need to freeze work on the staging branch, so we can use that for a pull request to the main repository. So if you happen to have a pull request open to the staging branch when this happens, we will temporarily close your pull request. Then after we have made a new staging branch with the latest updates from the main repository, we will ask you to rebase your work from the new staging branch, and open a new pull request there. The command to rebase is identical to the one above (that you would do if there is a conflict during your code review).
+* Continue with the code review as usual.