Visual Studio with Git: Conflict prevents checkout

(Copied from sister website: CodeEase.com)

I had a project which developed on different computers using .NET in Visual Studio 2013, I used Git for source code control on Visual Studio online. Tehre was one computer had not updated long time. When I tried to pull code, I got the following error:

An error occurred. Detailed message: 1 conflict prevents checkout.

image

Continue reading “Visual Studio with Git: Conflict prevents checkout”