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