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

Visual Studio 2013 seems to be lacking maturity as a GIT UI. I ran across similar issue even after having committed all my changes locally. For errors arising from Push & Pull in Visual Studio 2013, I would recommend using Git Bash to do a git pull command. The command-line pull command is much more powerful than VS UI and will overcome some issues.

In response to Walter Schultz, you are getting the error because you seem to be trying to keep binary & assembly files (dll and exe's) in version control. Binary files are not editable & not mergeable, thus they should not be included in version control.

In order to exclude these files from the GIT repository, you can create a .gitignore file and include following items:

--- begin .gitignore file ----------------
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# User-specific files
*.suo
*.user
*.sln.docstates
*.cache

# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
x64/
build/
bld/
[Bb]in/
[Oo]bj/
Dev/
bin/
--- end gitignore file ----------------

Once you create the .gitignore file, go into your local repository and delete all files in your /Bin/ folder and other files that you do not wish to keep track of.
Then push to local & sync your code to server repository.
Hope this helps.