Changes between Version 31 and Version 32 of Event/2014/GCI


Ignore:
Timestamp:
12/05/14 21:34:08 (7 years ago)
Author:
Pat Tressel
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • Event/2014/GCI

    v31 v32  
    6767}}}
    6868
    69 We will give each student their own branch in that GCI repository to receive their pull requests, to make it simpler and faster
    70 to get them merged, as we can review and merge work from students in parallel.
     69We are going to collect up student work for several days, and then test it and submit it all together to the main repository.
     70Because of that, we won't update from the main repository during that time. This will fix the problem students saw with having
     71extra commits from the main repository that were not in the GCI repository appear in their pull requests.
    7172
    72 So, there will be some changes to the procedure for submitting code.
     73We are going to use a branch called "staging" to hold students' work, so when you are ready to start working on code, you can
     74pull a copy of this branch to your local repository. This is where you will send pull requests. To get a copy of this branch:
    7375
    74 Instead of updating your branch from the main repository, there will be a branch in the GCI repository that we will keep
    75 stable for several days, that students can pull from to set up their own branches for GCI work. This will fix the problem
    76 students saw with getting extra commits out of the main repository that were not in the GCI repository.
    77 (This is part of the new procedures we're just designing, so there will be more info about this soon. For now, if you're
    78 just setting up your branch for GCI work, ask the mentors which branch to pull from.)
     76{{{
     77git pull edengci staging:your-branch-name
     78}}}
    7979
    80 Every few days, we will collect up students' work, and submit a combined PR to the main repository. At this point, we'll
    81 update the branch to pull from, and students can pull a fresh copy of that branch for any new work. Work already in progress
    82 can continue on the old branch, and we'll wait for that to include in the PR to the main repository.
     80You can call your local branch whatever you want. One suggestion is to pull a fresh copy of the staging branch when you are about
     81to start a new task. You can keep any old branch you were working on for previous tasks, or delete it after your pull request for
     82the previous task is accepted and merged into the staging branch.
    8383
    84 Even with this extra step, your commits will have your name on them, and will show up in the main repository.
     84Note, your commits will still have your name on them as author when they get into the main repository!
    8585
    8686The steps to submit your work are similar to those in the git wiki page linked above -- differences are noted here.
    8787* "Squash" your commits into one.
    88 * ''This is different:'' Don't rebase from the main repository -- you started with the right revision from the GCI branch, so don't need to update.
    89   (The mentors will rebase from the main repository while they are getting ready to send the combined PR.)
     88* ''This is different:'' Don't rebase from the main repository -- instead, rebase *from the staging branch* -- the same branch you will send the pull request to.
     89{{{
     90git pull --rebase edengci staging
     91}}}
    9092* Push your commit to your Eden repository on !GitHub.
    9193* Open the !GitHub page for your Eden repository.
    9294* Click the "Compare and Create Pull Request" button shown on that commit.
    9395* ''This is different:'' The pull request page has a line that shows which repository and branch you are sending the pull request too.
    94   You will need to change both, to the GCI repository and your branch name in the GCI repository.
     96  You will need to change both, to the GCI repository and the "staging" branch.
    9597  * There will be a down-arrow next to the repository -- that will give you a list of repositories. Select the GCI repository.
    9698  * Then use the down-arrow on the branch -- select your branch.