From: "Nigel Magnay" <nigel.magnay@gmail.com>
To: git <git@vger.kernel.org>
Subject: upps.. problem when rebasing (and subsequent nasties)
Date: Thu, 10 Apr 2008 17:57:20 +0100 [thread overview]
Message-ID: <320075ff0804100957t1901f78dhf528eef52140f5a5@mail.gmail.com> (raw)
I'm still n00bing around with git, but I've got it into a state which
has me confused..
In doing a git-rebase, I got a number of errors like
error: modules/realtime-app-ui/src/main/webapp/WEB-INF/faces-config.xml:
does not match index
...
Using index info to reconstruct a base tree...
What does this mean? I made matters significantly worse, but managed
to save my bacon with git-fsck --lost-found, but now my working copy
seems really unhappy. If I want to get back to my branch I try
git checkout thing
fatal: Entry 'modules/realtime-app-ui/src/main/webapp/WEB-INF/faces-config-core.xml'
not uptodate. Cannot merge.
I just want to get back to the start, so I
git reset --hard
git checkout foo
fatal: Entry 'modules/realtime-app-ui/src/main/webapp/WEB-INF/faces-config-core.xml'
not uptodate. Cannot merge.
I can probably recover it by blatting everything and starting over,
but I'd like to know what the mess is that I've managed to get into so
I can avoid it in the future!
reply other threads:[~2008-04-10 16:58 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=320075ff0804100957t1901f78dhf528eef52140f5a5@mail.gmail.com \
--to=nigel.magnay@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.
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 NNTP newsgroup(s).