Solving GitHub FetchHead (MergeConflict) in Visual Studio 2013

5 June, 2014 Roel van Lisdonk 4 Comments 1 category

I was getting the error:

An error occurred. Detailed message: An error was raised by libgit2. Category = FetchHead (MergeConflict).
3 conflicts prevent checkout.

To resolve this problem, I installed the 3rd-party Git command prompt tools, then you can open a Windows git command prompt from Visual Studio 2013: http://msdn.microsoft.com/en-us/library/vstudio/dd286572.aspx#commands

When I entered the command: git pull, I got the real error cause:

After removing these files and entering the commands:

git stash

git pull

The error was resolved.

4 Replies to “Solving GitHub FetchHead (MergeConflict) in Visual Studio 2013”

rodrigo rocha says:

June 24, 2015 at 16:15

Great! You saved my day! VS didnt tell us why cannot merge.
ganesh says:

June 26, 2016 at 18:40

C:\Users\xsiganesh\Source\Repos\paysystem1.0\PaySystem1.0>git pull
‘git’ is not recognized as an internal or external command,
operable program or batch file.
ganesh says:

June 26, 2016 at 18:41

pls help me on this
Artur says:

July 6, 2016 at 17:10

Thank you so much

1 March, 2016 Roel van Lisdonk 0 Comments 1 category

The most simple way to create a Visual Studio 2015…

9 September, 2013 Roel van Lisdonk 0 Comments 1 category

Sometimes you just one to copy and past…

6 February, 2015 Roel van Lisdonk 0 Comments 1 category

On my home network I wanted to set up a…