Got the error while switching to a branch
Cannot complete the operation because of existing changes to the following 2 files:
But the files are already committed.
The answer in the following SO post helps
http://stackoverflow.com/questions/28907086/vs2013-git-cannot-complete-the-operation-because-of-existing-changes-to-the-f
- Find the offending file in Explorer
- Rename it to remove its extension
- Go back to VS, you'll find the Changes window shows the file with the rename action
- Undo the rename change on that file
This should reset the state of the file and make it forget that there's a change on the file.
Now, you can simply switch or pull or do whatever was being blocked.