$ git mergetool – fires up an appropriate visual merge tool and walks you through the conflicts

$ git fetch origin – looks up which server origin is, fetches any data from it that you don’t yet have, and updates your local database, moving your origin/master pointer to its new, more up-to-date position