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

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.

Related Contents:

  1. How can I undo git reset –hard HEAD~1?
  2. How can I selectively merge or pick changes from another branch in Git?
  3. Git: How to solve Permission denied (publickey) error when using Git?
  4. Support for password authentication was removed. Please use a personal access token instead
  5. What’s the strategy for handling CRLF (carriage return, line feed) with Git?
  6. How to convert a normal Git repository to a bare one?
  7. Using the slash character in Git branch name
  8. Difference between msysgit and Cygwin + git?
  9. What does a grey icon in remote GitHub mean
  10. When should I use git pull –rebase?
  11. How to make shallow git submodules?
  12. What’s the equivalent of Subversion’s “use-commit-times” for Git?
  13. Two git repositories in one directory?
  14. git update-index –assume-unchanged on directory
  15. git-upload-pack: command not found, when cloning remote Git repo
  16. How to substitute text from files in git history?
  17. Password authentication is temporarily disabled as part of a brownout. Please use a personal access token instead [duplicate]
  18. Create a submodule repository from a folder and keep its git commit history
  19. How to link a folder with an existing Heroku app
  20. Undo git update-index –assume-unchanged
  21. Forking vs. Branching in GitHub
  22. Is there any way to git checkout previous branch?
  23. How do I make Git forget about a file that was tracked, but is now in .gitignore?
  24. Delete all local git branches
  25. Remove refs/original/heads/master from git repo after filter-branch –tree-filter?
  26. What’s the easiest way to deal with project configuration files?
  27. How to show the first commit by ‘git log’?
  28. How can I make git ignore future revisions to a file?
  29. use Winmerge inside of Git to file diff
  30. Remove a folder from git tracking
  31. Git: auto pull from repository?
  32. Why there are two ways to unstage a file in Git?
  33. How would I extract a single file (or changes to a file) from a git stash?
  34. Pull a certain branch from the remote server
  35. Force add despite the .gitignore file
  36. Completely cancel a rebase
  37. Local executing hook after a git push?
  38. Git allows for branch change with unstaged changes
  39. GitHub: Permission denied (publickey). fatal: The remote end hung up unexpectedly
  40. Use git “log” from another folder
  41. Visual Studio 2017 – Git failed with a fatal error
  42. Receiving “fatal: Not a git repository” when attempting to remote add a Git repo
  43. Making Git retain different section content between branches
  44. Git: Create a branch from unstaged/uncommitted changes on master
  45. Git remote branch deleted, but still it appears in ‘branch -a’
  46. How do I avoid the specification of the username and password at every git push?
  47. Where should I place my global ‘gitattributes’ file?
  48. Tracking changes to hooks in .git/hooks
  49. Unable to authenticate with Git Bash to Visual Studio Team Services
  50. Make git diff show UTF8 encoded characters properly

Leave a Comment