* Info Catalog Prev gawkworkflow: Removing Branches Up gawkworkflow: Development without commit access

gawkworkflow: Points to remember

 
 4.8 Points to Remember
 ======================
 
 There are some important points to remember:
 
    * Always do a 'make distclean' before switching between branches.
      Things will get really confused if you don't.
 
    * For upstream branches, _always_ work with tracking branches.
      _Never_ use 'git checkout origin/WHATEVER'.  Git will happily let
      you do something like that, but it's just plain asking for trouble.
 
    * Make sure your tracking branches are up-to-date before doing
      anything with them, particularly using them as the basis for a
      rebase or merge.  This typically means a three-step process:
 
           $ git checkout master             Get to local copy
           $ git pull                        Bring it up to date
           $ git checkout feature/python     Go back to your branch
 
      You can then do the actual rebase:
 
           $ git rebase master               Now rebase your feature off of master
 
    * Git always treats the currently checked-out branch as the object of
      operations.  For example, when comparing files with the regular
      'diff' command, the usage is 'diff OLDFILE NEWFILE'.  For 'git
      diff', the current branch takes the place of NEWFILE, thus:
 
           $ git checkout feature/python
           $ git diff master                 Compare master to current branch
 
      or if merging:
 
           $ git checkout master             Checkout master
           $ git pull                        Update tracking branch
           $ git merge feature/python        Merge changes into master
* Info Catalog Prev gawkworkflow: Removing Branches Up gawkworkflow: Development without commit access