CODEWITHSUNDEEP
gitvisual-studio-2013
TheRealDanBiss
TheRealDanBiss

Reputation: 254

An error was raised by libgit2. Category = 21 (MergeConflict)

I am using VS 2013.

I am stuck. Everything is committed to my local repository. I try to pull from remote and I get the following error:

An error occurred. Detailed message: An error was raised by libgit2. Category = 21 (MergeConflict). 1 uncommitted change would be overwritten by merge

I have no uncommitted changes...that I'm aware of.

Upvotes: 9

Views: 16542

Answers (3)

khalid saif
khalid saif

Reputation: 27

enter image description here

undo your web config file from the "exclude changes" section at "team explorer". hope it will work.it works for me.

Upvotes: 0

TheRealDanBiss
TheRealDanBiss

Reputation: 254

Looks like running git pull from the command prompt allowed me to execute the pull. I was unfamiliar with the command prompt.

Upvotes: 5

Edward Thomson
Edward Thomson

Reputation: 78683

Typically, you will see this message when you have modified a file, but not staged the changes, and the merge you are attempting would write to that file. Visual Studio 2013, unfortunately, contains a bug where it determines that your file is modified even though it is not. The bug manifests when you have a file in your repository that has line endings that disagree with what should have been produced, given your core.autocrlf settings.

This bug is fixed in Visual Studio 2013 Update 2: http://support.microsoft.com/kb/2927432

Upvotes: 3

Related Questions