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
I was having this problem in VS 2015 and the only thing that fixed it was restarting VS. None of the other situations mentioned above were applicable.