From: Rick Martinez <rick.martinez@gmail.com>
To: git@vger.kernel.org
Subject: Ref refs/heads/master is at *** but expected ***
Date: Mon, 6 Apr 2009 14:11:40 -0400 [thread overview]
Message-ID: <1fc2d7d00904061111s65ece9bal9a5c1288c631843b@mail.gmail.com> (raw)
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
reply other threads:[~2009-04-06 18:13 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1fc2d7d00904061111s65ece9bal9a5c1288c631843b@mail.gmail.com \
--to=rick.martinez@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).