The repos that exhibit this behavior are Visual Studio projects and the problem files are text files.
I don't think the problem is line endings git diff returns nothing and the projects have * text=auto in the .gitattributes file and core.autocrlf set to true. I believe the problem is caused by Visual Studio. This never happens on any project that doesn't use it. But I don't know what it's doing to the files. What I'm most confused by is why doesn't git checkout or git reset --hard resolve the problem. Why do I have to delete the .git\index for git to properly recreate these file? Maybe the built-in git client for Visual Studio built is messing up the index? On Tuesday, February 23, 2016 at 12:34:32 PM UTC-6, Ben Page wrote: > > I have a couple repos that routinely believe there are local changes, when > there are none. The only solution seems to be to delete these files > and reacquire them from git. > > For example: > > >git status > On branch master > Your branch is behind 'origin/master' by 2 commits, and can be > fast-forwarded. > (use "git pull" to update your local branch) > Changes not staged for commit: > (use "git add <file>..." to update what will be committed) > (use "git checkout -- <file>..." to discard changes in working directory) > modified: XXXXXXX > modified: YYYYYYY > no changes added to commit (use "git add" and/or "git commit -a") > > >git --version > git version 2.7.2.windows.1 > > Reset doesn't work. > > >git reset --hard > HEAD is now at cebdb13 Commit Message > > >git pull > Updating cebdb13..076de5e > error: Your local changes to the following files would be overwritten by > merge: > XXXXXXX > YYYYYYY > Please, commit your changes or stash them before you can merge. > Aborting > > Checkout doesn't work > > >git checkout XXXXXXX > >git checkout YYYYYYY > > >git pull > Updating cebdb13..076de5e > error: Your local changes to the following files would be overwritten by > merge: > XXXXXXX > Please, commit your changes or stash them before you can merge. > Aborting > > The only solution that I've found . > >rm .git\index > >rm XXXXXXX > >rm YYYYYYY > >git reset --hard > >git pull > Updating cebdb13..076de5e > Fast-forward > ... > > Can anyone help me understand why this is happening and how to avoid it? > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
