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

Running this from command line "git merge {branch name}", yielded a more specific error. "Merge conflict in .gitignore"