Changes between Version 9 and Version 10 of DeveloperGuidelines/Git/GCI


Ignore:
Timestamp:
12/06/14 03:44:49 (7 years ago)
Author:
Pat Tressel
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • DeveloperGuidelines/Git/GCI

    v9 v10  
    2525
    2626We will also have a ''base'' branch that shows the revision that was current in the main repository's master branch
    27 at the time we start a new aggregations cycle. This is present purely for convenience in identifying the common base
    28 revision between the staging branch and the main repository's master branch. Students will not need to do anything with
    29 the base branch.
     27at the time we started a new cycle of aggregating student work on the staging branch. This is present purely for
     28convenience in identifying the common base revision between the staging branch and the main repository's master branch.
     29Students will not need to do anything with the base branch.
    3030
    3131(By tradition in some popular git workflows, the master branch remains a mirror of the parent repository. To avoid
    32 disturbing that tradition, we can just use different names for our branches.)
     32disturbing that tradition, we are using different names for our branches.)
    3333
    3434Since all student work during an aggregation cycle goes to the same staging branch, other students' work will likely be