* Ref refs/heads/master is at *** but expected ***
@ 2009-04-06 18:11 Rick Martinez
0 siblings, 0 replies; only message in thread
From: Rick Martinez @ 2009-04-06 18:11 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-04-06 18:13 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-04-06 18:11 Ref refs/heads/master is at *** but expected *** Rick Martinez
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).