Changes between Version 16 and Version 17 of UsingGitHub

Timestamp:

Mar 16, 2012 5:49:27 AM (12 years ago)

Author:

jarred@sencha.com

Comment:

--

UsingGitHub

@@ -22 +22 @@
 
  1. One-time setup: `$ git remote add upstream git://github.com/WebKit/webkit.git`
+ 1. Switch to master branch if necessary: `$ git checkout master`
  1. `$ git fetch upstream`
  1. `$ git merge upstream/master`
@@ -27 +28 @@
 
 If 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.
+
+== Rebase from master ==
+
+ 1. Make sure all commits are complete on your awesomefeature branch.
+ 1. `$ git checkout master`
+ 1. `$ git pull upstream master`
+ 1. `$ git checkout awesomefeature`
+ 1. `$ git rebase master`
+ 1. Fix merge conflicts through the rebase as you normally would with git.
 
 == Getting your code reviewed ==