I run into a situation with a git repository that I was no longer able to switch between branches. Git complains about uncommitted changes. But I was sure that my local repository should not have any changes.
For force a hard checkout and pull use the following git commands. NOTE: this will overwrite any local changes – so be careful:
git checkout mybranch git fetch --all git reset --hard origin/mybranch git pull