Changes between Version 20 and Version 21 of UsingGitHub


Ignore:
Timestamp:
Mar 21, 2012 6:31:00 PM (12 years ago)
Author:
abarth@webkit.org
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • UsingGitHub

    v20 v21  
    2121== Tracking upstream ==
    2222
    23  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`
    25  1. `$ git fetch upstream`
    26  1. `$ git merge upstream/master`
    27  1. `$ git push origin master`
     23 1. One-time setup: [http://trac.webkit.org/browser/trunk/Tools/Scripts/configure-github-as-upstream /Tools/Scripts/configure-github-as-upstream]
     24 1. [http://trac.webkit.org/browser/trunk/Tools/Scripts/sync-master-with-upstream ./Tools/Scripts/sync-master-with-upstream]
    2825
    2926If 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.