Re: git rebase keeps saying local changes would conflict..what changes?
Just found a similar problem here: http://stackoverflow.com/questions/5074136. I do use Xcode, which may be related. Maybe I'll try the proposed solution. But I'd still love to know what the issue is, or how I can help debug it.
On Jun 14, 2012, at 4:41 PM, Eric Gillum wrote:
> Hi,
>
> I have a sometimes-reproducible issue when trying to rebase. In short, I've created a local branch B off of master, made several commits on B, switched to master and pulled, switched back to B, then tried "git rebase master", which fails. What I get about half the time is a failure that claims I have local changes to files that would be overridden by the merge. Nothing is reported by git status (I've even tried closing all editors), so I am forced to do git rebase --abort or --skip. I can't skip because the commits only exist on B. So I abort and just try the rebase from scratch, and somewhat less than half the time git claims there are conflicts in certain files. Sometimes I bite the bullet and go fix those conflicts. Sometimes I abort again and rebase again until eventually...it just s
>
> What's wrong? Why would I get the local changes warning but have no local changes? The merge conflicts tend to be within a file that has been changed multiple times on B. These "conflicts" are literally changes I've made at one point or another on B. The relevant files were never touched on master while I was working on B. And no changes on B are amends or reverts or anything remotely tricky -- they're simply more changes committed with "git commit". So why would I have to "resolve conflicts"?
>
> This is git version 1.7.9.3. Your insight appreciated.