Solving GitHub FetchHead (MergeConflict) in Visual Studio 2013
June 5, 2014 4 Comments
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:
The error was resolved.Tags: GitHub, Visual Studio
4 Replies to “Solving GitHub FetchHead (MergeConflict) in Visual Studio 2013”
Great! You saved my day! VS didnt tell us why cannot merge.
‘git’ is not recognized as an internal or external command,
operable program or batch file.
pls help me on this
Thank you so much