Changes between Version 8 and Version 9 of GitUsage


Ignore:
Timestamp:
08/07/11 16:33:12 (7 years ago)
Author:
magnate
Comment:

Added link to new PullRequest? page

Legend:

Unmodified
Added
Removed
Modified
  • GitUsage

    v8 v9  
    1313Once you have tested your commits to your satisfaction, you can share them. Assuming you have created a new branch and made your changes as described above, you can publish your changes to the world by using `git push origin newbranch` - this will make your new branch appear on github for others to test. (It is advisable, but not essential, to use ssh keys for access to github.)  
    1414 
    15 Do not worry about the staging or integration branches: they are irrelevant to your development activity. You can delete them from your fork with impunity if you are tidy-minded. 
     15Do not worry about the integration branch: it is irrelevant to your development activity. You can delete it from your fork with impunity if you are tidy-minded. 
    1616 
    1717Keep your thinking clear: separate your work into different branches for different things. Create a branch called 'docs' if you want to work on some docs. Create one called 'stores' if you want to make changes to stores. Etc. There is no limit to the number of branches you can have, and you can use `git checkout branchname` to switch between branches at any time. (Ideally you should commit any changes in the current branch before switching branches, but git does not like people undoing things so read up on `git stash` if you need to switch branches and don't want to either commit or lose the current changes.) 
     
    1919If you are a member of "team angband" on github, please read [[Policy/GitMaster]] before making changes to the official angband repo. 
    2020 
     21If you want the devteam to merge your work into the official repository, please read up on how to submit a [[PullRequest]]. 
    2122 
    2223== So what do I do if I get out of sync with a remote I'm tracking? ==