gistfile1.txt

[lifo@null rails (master)]$ git pull
remote: Counting objects: 193, done.
remote: Compressing objects: 100% (109/109), done.
remote: Total 114 (delta 89), reused 0 (delta 0)
Receiving objects: 100% (114/114), 12.14 KiB, done.
Resolving deltas: 100% (89/89), completed with 48 local objects.
From [email protected]:rails/rails
   a491b19..6720b25  2-3-stable -> origin/2-3-stable
   97159fa..b5dfdc7  HEAD       -> origin/HEAD
error: Ref refs/remotes/origin/master is at b5dfdc714fab7d2836e0a979ca88b4a17db9ec06 but expected 97159fad6a69cc0bc6fe504e2063bb98fcf6e42d
 ! 97159fa..b5dfdc7  master     -> origin/master  (unable to update local ref)
error: some local refs could not be updated; try running
 'git remote prune origin' to remove any old, conflicting branches