Solving GitHub fetchhead (mergeconflict) in Visual Studio 2013

Source: Internet
Author: User

I was getting the error:

An error occurred. Detailed Message:an error is raised by Libgit2. Category = Fetchhead (mergeconflict).
3 conflicts prevent checkout.

To resolve this problem, I installed the 3rd-party git command prompt tools and then you can open a Windows Git command promp T 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.

Solving GitHub fetchhead (mergeconflict) in Visual Studio 2013

Related Article

Contact Us

The content source of this page is from Internet, which doesn't represent Alibaba Cloud's opinion; products and services mentioned on that page don't have any relationship with Alibaba Cloud. If the content of the page makes you feel confusing, please write us an email, we will handle the problem within 5 days after receiving your email.

If you find any instances of plagiarism from the community, please send an email to: info-contact@alibabacloud.com and provide relevant evidence. A staff member will contact you within 5 working days.

A Free Trial That Lets You Build Big!

Start building with 50+ products and up to 12 months usage for Elastic Compute Service

  • Sales Support

    1 on 1 presale consultation

  • After-Sales Support

    24/7 Technical Support 6 Free Tickets per Quarter Faster Response

  • Alibaba Cloud offers highly flexible support services tailored to meet your exact needs.