Changes between Version 17 and Version 18 of UsingGitHub


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

--

Legend:

Unmodified
Added
Removed
Modified
  • UsingGitHub

    v17 v18  
    2929If 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.
    3030
    31 == Rebase from master ==
     31== Rebase from upstream/master ==
    3232
    3333 1. Make sure all commits are complete on your awesomefeature branch.