All the local changes for sandbox must be committed locally 
All the updates on the server must be fetched
If there are any clashes you will be told to fix them via manually
merging the differences = nightmare

Because you are working on a shared sandbox, you must refresh the
changes that maybe Gin or others are making and commit those too so it's
clean or it will become a problem..
from there once you have commited the change you can then pull the repo
= a merge
and then push your commit to upstream


WATCH
Merge branch 'master' of
git@github.com:kryptick/bubblebathbay_sandbox.git

Conflicts:
	config/Thumbs.db