Changes between Version 34 and Version 35 of DeveloperGuidelines/Git


Ignore:
Timestamp:
03/16/12 01:00:34 (10 years ago)
Author:
James O'Neill
Comment:

Pulling from upstream before rebasing

Legend:

Unmodified
Added
Removed
Modified
  • DeveloperGuidelines/Git

    v34 v35  
    2929git checkout master
    3030git pull # to get any merges, pulls or edits which you may have done on your GitHub branch
     31git pull upstream master
    3132git checkout <mystory>
    3233git rebase master #The rebase command will apply your commits ON TOP of the latest revisions from trunk, so that they are committed in the right order.