Why do I sometimes see an “Entry ‘filename’ not uptodate. Cannot merge.” after a ‘git reset –hard’ and a ‘git pull’?

September 15, 2023 by Tarik

The easiest solution I have found to this problem is:

git add .
git merge --abort