threads / discuss / 18751

Ref refs/heads/master is at *** but expected ***

Subject: Ref refs/heads/master is at *** but expected ***

## tl;dr

One message between Apr 6, 2009 and Apr 6, 2009.

replies: 0people: 1as markdown or json

Rick Martinez· Apr 6, 2009, 18:11 UTC · lore
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

← back to recent threads