[JoshTriplett]

You still need to know how to use git stash, in case the stash doesn't cleanly apply after the pull.