It seems we're going to be using Scald in our Drupal 7 redesign. I've never heard of it, so after a quick search, turns out it's a Drupal 7 module for media/image management like Media, only different. From what I read, it creates its own entity system instead of relying on the core entity system.
I'm on a project working with an outside shop right now, and of course they have their own workflow. I always learn something new from these experiences and this is no exception.
I've used git pull since I started working with GIT to pull down the lastest from a repo. This week I was introduced to git up which will stash any changes you haven't committed, pull the repo, and unstash those changes.