From: Rick Martinez <rick.martinez@gmail.com>
Date: Mon, 06 Apr 2009 18:11:40 GMT
Subject: Ref refs/heads/master is at *** but expected ***
Message-ID: <1fc2d7d00904061111s65ece9bal9a5c1288c631843b@mail.gmail.com>

Hey guys,

So I was doing an interactive rebase and when I continued after fixing
a conflict, I got:

error: Ref refs/heads/master is at
13c56aa5628c03953912a683136f38cad852471b but expected
25713c34497cf07e4476291e6cd720d8a667701c
fatal: Cannot lock the ref 'refs/heads/master'.

When I do a git status, I get:

# On branch master
# Your branch and 'origin/master' have diverged,
# and have 6 and 5 different commit(s) each, respectively.
#
nothing to commit (working directory clean)

Any ideas on what to do next to try and get my branch back in order?

Thanks!
Rick