Problem with a push

From: Alex R.M. Turner <aturner@plexq.com>
Date: Jun 11, 2007, 21:32 UTC
Message-ID: <Pine.LNX.4.64.0706111632050.4406@www.mintpixels.com>

I get the following error when pushing after a merge:

updating 'refs/heads/master'
  from c18f9e4350c26e6b45d0a282ff32991784becbdd
  to   39b7d927720c9f2810e0af5311975119c0d7c7bd
updating 'refs/remotes/origin/HEAD'
  from 1e631edb3078ec3a4d1fa598c8f410f6a61659b0
  to   c18f9e4350c26e6b45d0a282ff32991784becbdd
updating 'refs/remotes/origin/master'
  from 1e631edb3078ec3a4d1fa598c8f410f6a61659b0
  to   c18f9e4350c26e6b45d0a282ff32991784becbdd
Generating pack...
Done counting 26 objects.
Result has 10 objects.
Deltifying 10 objects...
 100% (10/10) done
Writing 10 objects...
 100% (10/10) done
Total 10 (delta 7), reused 0 (delta 0)
refs/heads/master: c18f9e4350c26e6b45d0a282ff32991784becbdd -> 
39b7d927720c9f2810e0af5311975119c0d7c7bd
ng refs/remotes/origin/master failed to lock
refs/remotes/origin/HEAD: 1e631edb3078ec3a4d1fa598c8f410f6a61659b0 -> 
c18f9e4350c26e6b45d0a282ff32991784becbdd
error: Ref refs/remotes/origin/master is at 
c18f9e4350c26e6b45d0a282ff32991784becbdd but expected 
1e631edb3078ec3a4d1fa598c8f410f6a61659b0
error: failed to lock refs/remotes/origin/master
error: failed to push to 'ssh://aturner@svn.mintpixels.com/data/git/mls'

but when I try it again, it just says Everything up-to-date.

Alex