Git pull: error: Entry foo not uptodate. Cannot merge

by

This may happen if you update the index to ignore certain files: 

git update-index --assume-unchanged <file>

and then for instance checkout some other branch:

git checkout <branch>
> error: Entry '<file>' not uptodate. Cannot merge.

Forcing index refresh fixes the issue:

git update-index --really-refresh
<file>: needs update

Followed by:

git reset --hard

And then everything should be back to normal.

More Related Contents:

  1. Error when pushing amended commit to remote [duplicate]
  2. Can git automatically switch between spaces and tabs?
  3. gitosis vs gitolite? [closed]
  4. How to do a GitHub pull request
  5. Unable to Git-push master to Github – ‘origin’ does not appear to be a git repository / permission denied
  6. How to cherry-pick multiple commits
  7. Specify an SSH key for git push for a given domain
  8. Configure Git clients, like GitHub for Windows, to not ask for authentication
  9. Handling file renames in Git
  10. fetch in git doesn’t get all branches
  11. Git pre-commit hook : changed/added files
  12. How to track untracked content?
  13. Should “node_modules” folder be included in the git repository
  14. Unlink of file Failed. Should I try again?
  15. How do you remove an invalid remote branch reference from Git?
  16. Show diff between commits
  17. Is there a way of having git show lines added, lines changed and lines removed?
  18. Restore a deleted folder in a Git repo
  19. Adding a collaborator to my free GitHub account?
  20. Git is moving to new hashing algorithm SHA-256 but why git community settled on SHA‑256
  21. Using git with ssh-agent on Windows
  22. How do I list all remote branches in Git 1.7+?
  23. “fetch –all” in a git bare repository doesn’t synchronize local branches to the remote ones
  24. Make .git directory web inaccessible
  25. How to create a new (and empty!) “root” branch?
  26. How to check if remote branch exists on a given remote repository?
  27. How to list files ignored with ‘skip-worktree’
  28. Calling ‘git pull’ from a git post-update hook
  29. How do I show my global Git configuration?
  30. Why does ‘git commit’ not save my changes?

Leave a Comment