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

upps.. problem when rebasing (and subsequent nasties)

From
Nigel Magnay <nigel.magnay@gmail.com>
Date
Apr 10, 2008, 16:57 UTC
Message-ID
<320075ff0804100957t1901f78dhf528eef52140f5a5@mail.gmail.com>

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!

Message 1 of 1 in “upps.. problem when rebasing (and subsequent nasties)”
  1. Nigel MagnayApr 10, 2008

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.