# rebase fails mid way through due to locally modified file? 2 messages from 2012-10-10 to 2012-10-11. Participants: skillzero@gmail.com, Peter Krefting. Thread: https://gitlist.dev/t/31774 ## skillzero@gmail.com, 2012-10-10 00:31 Subject: rebase fails mid way through due to locally modified file? Message-ID: URL: https://gitlist.dev/e/CANRUUDNoUNMy1qHkYt-_wwxGtWrRY9vi8-CjzY8WhJ2gur%2BzTg%40mail.gmail.com ``` I frequently see rebase fail after applying several commits because git thinks there are local changes. Before the rebase started, there were no local changes and after the rebase fails, doing a git status doesn't show any locally modified files. I was seeing this on git 1.7.x and I also tried updating to git 1.8rc1 and it fails there too. I see progress like this: -- Applying: Commit X Applying: Commit Y Applying: Commit Z Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... error: Your local changes to the following files would be overwritten by merge: MyFile.h Please, commit your changes or stash them before you can merge. Aborting Failed to merge in the changes. Patch failed at 0013 Commit A The copy of the patch that failed is found in: /Source/.git/rebase-apply/patch When you have resolved this problem, run "git rebase --continue". If you prefer to skip this patch, run "git rebase --skip" instead. To check out the original branch and stop rebasing, run "git rebase --abort". -- If I git rebase --abort then retry, it usually fails again, but sometimes on a different file. Once in a while, retrying will succeed. Is this a known issue? I can't make the source for my repo available, but is there some way I can provide more info to help narrow this down? ``` ## Peter Krefting, 2012-10-11 11:35 Subject: Re: rebase fails mid way through due to locally modified file? Message-ID: URL: https://gitlist.dev/e/alpine.DEB.2.00.1210111234150.2378%40ds9.cixit.se In-Reply-To: ``` skillzero@gmail.com: > I frequently see rebase fail after applying several commits because > git thinks there are local changes. What operating system are you running on? I have seen simlar issues on Windows, which has a case-insensitive file system, in repositories where file names have either changed just the casing of their names, or there has been several files where the only difference in names were only character casing. -- \\// Peter - http://www.softwolves.pp.se/ ```