Git sees non-existent local changes and prevents pull

user_2094068 0
Viewed 2398

If I change a file, add my changes, commit them, and pull, Git claims that I have uncommitted changes. When I try to commit again, I receive a "nothing to commit, working tree clean" message. 

[Annas-MacBook-Pro:Project Anya$ git status
On branch master
Your branch and 'origin/master' have diverged,
and have 4 and 3 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)
nothing to commit, working tree clean
Annas-MacBook-Pro:Project Anya$ git pull origin master
anna@anna-git's password: 
From ssh://anna-git/git/Project
 * branch            master     -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
    index.html
    js/app.js
    sass/custom.scss
Please commit your changes or stash them before you merge.
Aborting

I'm sure that I haven't changed the files again, but even if something had somehow changed them, it won't let me commit them again. Why does git think that I have local changes? How can I resolve this?

git
1 Answers
Related