Changes between Version 7 and Version 8 of GitUsage


Ignore:
Timestamp:
07/12/11 17:49:57 (3 years ago)
Author:
magnate
Comment:

Added tip about pull requests.

Legend:

Unmodified
Added
Removed
Modified
  • GitUsage

    v7 v8  
    4949Don't be afraid to create and delete lots of branches. They're totally expendable, and a new branch is a fresh start. 
    5050 
    51 Always update your local copy of the official repository (git fetch official) before pushing your work. If possible, use "git rebase official/staging" to ensure that your changes are on top of the very latest commits from the staging branch - that will make them easier to merge. If you are nervous about trying this on a branch with lots of your hard work in it, create a new copy of that branch first - so if the rebase goes horribly wrong, your original branch is untouched. 
     51Always update your local copy of the official repository (git fetch official) before pushing your work. If possible, use "git rebase official/staging" to ensure that your changes are on top of the very latest commits from the staging branch - that will make them easier to merge, and is much neater than merging official branches into your branches and having the devteam merge them back again. If you are nervous about trying rebase on a branch with lots of your hard work in it, create a new copy of that branch first - so if the rebase goes horribly wrong, your original branch is untouched. 
     52 
     53When submitting pull requests on github, please ensure that you choose only the commits relevant to this request - try and avoid choosing merge commits or commits which are part of another pull request.