{"thread":{"id":"13055","subject":"upps.. problem when rebasing (and subsequent nasties)","startedAt":"2008-04-10T16:57:20Z","lastAt":"2008-04-10T16:57:20Z","messageCount":1,"participants":["Nigel Magnay"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"74086","messageId":"320075ff0804100957t1901f78dhf528eef52140f5a5@mail.gmail.com","threadId":"13055","inReplyTo":null,"subject":"upps.. problem when rebasing (and subsequent nasties)","fromName":"Nigel Magnay","fromEmail":"nigel.magnay@gmail.com","sentAt":"2008-04-10T16:57:20Z","receivedAt":"2008-04-10T16:57:20Z","isPatch":false,"sender":{"key":"nigel.magnay@gmail.com","avatar":"https://gravatar.com/avatar/d85cf38287bef3a8e4fa02358d2756d7589f8676c5eeb881ce2f6d731e4526c3?d=mp&s=160"},"body":"I'm still n00bing around with git, but I've got it into a state which\nhas me confused..\n\nIn doing a git-rebase, I got a number of errors like\n\nerror: modules/realtime-app-ui/src/main/webapp/WEB-INF/faces-config.xml:\ndoes not match index\n...\nUsing index info to reconstruct a base tree...\n\nWhat does this mean? I made matters significantly worse, but managed\nto save my bacon with git-fsck --lost-found, but now my working copy\nseems really unhappy. If I want to get back to my branch I try\n\ngit checkout thing\n\nfatal: Entry 'modules/realtime-app-ui/src/main/webapp/WEB-INF/faces-config-core.xml'\nnot uptodate. Cannot merge.\n\nI just want to get back to the start, so I\ngit reset --hard\ngit checkout foo\nfatal: Entry 'modules/realtime-app-ui/src/main/webapp/WEB-INF/faces-config-core.xml'\nnot uptodate. Cannot merge.\n\nI can probably recover it by blatting everything and starting over,\nbut I'd like to know what the mess is that I've managed to get into so\nI can avoid it in the future!\n"}]}