Visual Studio 2013 Github commit deadlock

Question

A few friends and I are working on a project via GitHub. We are all sharing the same branch, which may or may not be a good idea.

I edited some of the code and committed

Answer 1

Same thing was happening to me, I committed all my changes and get the same error when I try to switch branches.

I realized there was one file I chose to "ignore" which I left under the "Excluded Changes". Apparently, VS2013 is not properly handling this exclusions well.

So after many tries I came up with a simple solution:

1. I moved the file to ignore from "Excluded Changes" to the "Included Changes";
2. I made a local commit;
3. Switched branch without problem;