Changes between Version 16 and Version 17 of UsingGitHub


Ignore:
Timestamp:
Mar 16, 2012 5:49:27 AM (10 years ago)
Author:
jarred@sencha.com
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • UsingGitHub

    v16 v17  
    2222
    2323 1. One-time setup: `$ git remote add upstream git://github.com/WebKit/webkit.git`
     24 1. Switch to master branch if necessary: `$ git checkout master`
    2425 1. `$ git fetch upstream`
    2526 1. `$ git merge upstream/master`
     
    2728
    2829If you never modify your local master branch, merging upstream/master will always be a fast-forward merge (i.e., no merge conflicts).  You can then merge these new commits into your in-flight feature branches as you normally would with git.
     30
     31== Rebase from master ==
     32
     33 1. Make sure all commits are complete on your awesomefeature branch.
     34 1. `$ git checkout master`
     35 1. `$ git pull upstream master`
     36 1. `$ git checkout awesomefeature`
     37 1. `$ git rebase master`
     38 1. Fix merge conflicts through the rebase as you normally would with git.
    2939
    3040== Getting your code reviewed ==