Occasionally, when I do the following...
git reset --hard
HEAD is now at 0123abde comment is here
error: Entry 'filename' not uptodate. Cannot merge.
The general idea behind "
Entry 'filename' not uptodate. Cannot merge." is:
You have changes to files in your working directory that will be overwritten, removed or otherwise lost if the checkout and change to the new branch were to proceed.
It has been reported that this message could be "spurious" at time, (potentially because "
git pull" did not refresh the index before trying to merge) but the fix was in Git1.6.1.
However, it may still be in mSysGit 1.6.1, so do you see the same error with a more recent mSysGit version ? (like 1.6.3)