What Operating System are you on (version etc) and which Git version.

If you are on Windows (and perhaps Mac), do check the file name casing 
(upper/lower) as both ignore case but preserve it.

Other options are that you have a line ending setting that does not 'round 
trip' properly, so maybe LF in the repo, but CRLF checked out, yet wants to 
check-in (add) as unchanged...

Is it all files, all text files, or are they binary, etc. 

Is it just a few files.

If other repos have no problem, compare their local config files with that of 
the problem repos..


----- Original Message ----- 
  From: Ben Page 
  To: Git for human beings 
  Sent: Tuesday, February 23, 2016 6:34 PM
  Subject: [git-users] Git says there are local changes, but there are no 
changes. (Windows)


  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 git-users+unsubscr...@googlegroups.com.
  For more options, visit https://groups.google.com/d/optout.

-- 
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 git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to