Changes between Version 1 and Version 2 of GitUsage


Ignore:
Timestamp:
10/31/10 18:42:05 (8 years ago)
Author:
magnate
Comment:

minor clarifications

Legend:

Unmodified
Added
Removed
Modified
  • GitUsage

    v1 v2  
    99  * origin/integration 
    1010 
    11 Do NOT do your work in your master branch: this is asking for trouble. Create a new branch using `git checkout -b newbranch`, and do your work there. Use `git commit -a` to commit it to your new branch and then autogen/configure/make to test them.  
     11Do NOT do your work in your master branch: this is asking for trouble. Create a new branch using `git checkout -b newbranch`, and do your work there. Use `git commit -a` to commit your changes to your new branch and then autogen/configure/make to test them.  
    1212 
    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.)  
     
    1515Do 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. 
    1616 
    17 Keep 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 read up on `git stash` if you need to switch branches and don't want to commit or lose the current changes.) 
     17Keep 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.) 
    1818 
    1919= Angband devteam policy =