Changes between Version 13 and Version 14 of DeveloperGuidelines/Git/GCI


Ignore:
Timestamp:
12/06/14 04:10:32 (7 years ago)
Author:
Pat Tressel
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • DeveloperGuidelines/Git/GCI

    v13 v14  
    7878code-reviewed on !GitHub, but we can add another page with code review tips if that would be useful.
    7979
    80 You may need to assist students with interactive rebase to squash their commits, and with rebasing from the staging
    81 branch. See the student procedures for more about this.
     80Once the review is done, and you're satisfied with the student's work, ask them to squash their commits and rebase from the
     81staging branch.
     82
     83The big difference here is that ''you will be the one poking that friendly green "merge" button''. If the button isn't green,
     84and doesn't say the pull request can be automatically merged, then the student will need to rebase from the staging branch again,
     85and fix the conflicts. (Note the student should rebase from staging even if the PR can be automatically merged, as that can
     86be true even if the staging branch has changes past the revision at which the student pulled their branch. Doing one last
     87rebase will put the commits in time order, with the student's new commit after the others on the staging branch, and avoid an
     88internal non-linear "merge commit".)
     89
     90You may need to assist students with interactive rebase to squash their commits, with rebasing from the staging
     91branch, and with fixing conflicts during the rebase, if it's the first time they've done it.
     92
     93Also see the student procedures, so you know what they know.
    8294=== Aggregation cycle ===
    8395