I\'m a Git newbie. I recently moved a Rails project from Subversion to Git. I followed the tutorial here: http://www.simplisticcomplexity.com/2008/03/05/cleanly-migrate-yo
sometimes there's a difference between the local cached version of origin master (origin/master) and the true origin master.
If you run git remote update this will resynch origin master with origin/master
see the accepted answer to this question
Differences between git pull origin master & git pull origin/master