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

Question

I\'m trying to update my repo from a remote branch and keep getting this error when I do a \"git pull\". I haven\'t made any local changes, and even if I have I don\'t need

Answer 1

Worth a try:

Could you set, just for this update, set the config parameter core.trustctime to false?

core.trustctime

If false, the ctime differences between the index and the working copy are ignored; useful when the inode change time is regularly modified by something outside Git (file system crawlers and some backup systems).