Tortoise git

Problem with tortoise git showing conflicted/error directory, but git status shows everything is ok:
http://www.benjaminbooth.com/tableorbooth/2011/03/tortoisegit-1630-caching-errors.html