If you are theming a Drupal 7 site using the dCycle workflow, and a colleague has updated features (for example, added a new view, content type, etc.), here's how to theme it:
git status. If your directory is not clean, commit your latest changes, for example
git add .
git commit -a -m 'my latest changes'
git pull origin master