After seeing the following from the command line:
# On branch RB_3.0.10 # Changed but not updated: # (use \"git add ...\" to update what will b
I also faced somewhat similar problem and the following steps helped me out:
git commit -am 'temp commit' git pull origin master git reset head~1 git reset head --hard
Hope it helps other people as well.