{"thread":{"id":"31774","subject":"rebase fails mid way through due to locally modified file?","startedAt":"2012-10-10T00:31:19Z","lastAt":"2012-10-11T11:35:22Z","messageCount":2,"participants":["skillzero@gmail.com","Peter Krefting"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"200870","messageId":"CANRUUDNoUNMy1qHkYt-_wwxGtWrRY9vi8-CjzY8WhJ2gur+zTg@mail.gmail.com","threadId":"31774","inReplyTo":null,"subject":"rebase fails mid way through due to locally modified file?","fromName":"","fromEmail":"skillzero@gmail.com","sentAt":"2012-10-10T00:31:19Z","receivedAt":"2012-10-10T00:31:19Z","isPatch":false,"sender":{"key":"skillzero@gmail.com","avatar":null},"body":"I frequently see rebase fail after applying several commits because\ngit thinks there are local changes. Before the rebase started, there\nwere no local changes and after the rebase fails, doing a git status\ndoesn't show any locally modified files. I was seeing this on git\n1.7.x and I also tried updating to git 1.8rc1 and it fails there too.\nI see progress like this:\n\n--\nApplying: Commit X\nApplying: Commit Y\nApplying: Commit Z\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nerror: Your local changes to the following files would be overwritten by merge:\n\tMyFile.h\nPlease, commit your changes or stash them before you can merge.\nAborting\nFailed to merge in the changes.\nPatch failed at 0013 Commit A\nThe copy of the patch that failed is found in:\n   /Source/.git/rebase-apply/patch\n\nWhen you have resolved this problem, run \"git rebase --continue\".\nIf you prefer to skip this patch, run \"git rebase --skip\" instead.\nTo check out the original branch and stop rebasing, run \"git rebase --abort\".\n--\n\nIf I git rebase --abort then retry, it usually fails again, but\nsometimes on a different file. Once in a while, retrying will succeed.\n\nIs this a known issue? I can't make the source for my repo available,\nbut is there some way I can provide more info to help narrow this\ndown?\n"},{"id":"200983","messageId":"alpine.DEB.2.00.1210111234150.2378@ds9.cixit.se","threadId":"31774","inReplyTo":"CANRUUDNoUNMy1qHkYt-_wwxGtWrRY9vi8-CjzY8WhJ2gur+zTg@mail.gmail.com","subject":"Re: rebase fails mid way through due to locally modified file?","fromName":"Peter Krefting","fromEmail":"peter@softwolves.pp.se","sentAt":"2012-10-11T11:35:22Z","receivedAt":"2012-10-11T11:35:22Z","isPatch":false,"sender":{"key":"peter@softwolves.pp.se","avatar":"https://avatars.githubusercontent.com/u/990764?v=4"},"body":"skillzero@gmail.com:\n\n> I frequently see rebase fail after applying several commits because\n> git thinks there are local changes.\n\nWhat operating system are you running on? I have seen simlar issues on \nWindows, which has a case-insensitive file system, in repositories \nwhere file names have either changed just the casing of their names, \nor there has been several files where the only difference in names \nwere only character casing.\n\n-- \n\\\\// Peter - http://www.softwolves.pp.se/\n"}]}