git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
RMRick Martinez <rick.martinez@gmail.com>
Date
Apr 6, 2009, 18:11 UTC
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

Message 1 of 1 in “Ref refs/heads/master is at *** but expected ***”
  1. Rick MartinezApr 6, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.