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

I didn't had uncommit changes, still had the same error when performing the merge to develop. I tried:

1. git status, and then
2. git pull

And then tried the merge to develop again and the error does not show up anymore. I had to solve some conflicts though. I can image that only the second command is really relevant but I have no clue what is happening here so I rather document all the steps.