Friday, 24 April 2015

An error occurred. Detailed message: 2 conflicts prevent checkout

Git error: An error occurred. Detailed message: 2 conflicts prevent checkout
Solution:

Close all your solutions
Open new visual studio
Connect to team foundation server
Connect to Git
Click on Home
Go to changes
If you see any Untracked files, those file are giving problem to you...
Take the back up of all your projects<Code>
Now delete Untracked files from Git.
Now Pull and sync