"Conflicts prevent checkout" error using Git in Visual Studio

I am using Git in Visual Studio. When I am trying to synchronize, the following message appears:

An error occured. Detailed message: An error was raised by libgit2. Cetegory = checkout(MergeConflict). 1 conflicts prevent checkout

I don't have a clue about what the conflicts are and how to fix them. Can anyone help me overcome this problem?

Answers


I have solved the same problem by using the Git command prompt in Visual Studio, because it gives you more ability:

http://msdn.microsoft.com/en-us/library/vstudio/dd286572.aspx

You also may install this extension to facilitate the work with it (it gives you ability do not enter passwords each time):

http://gitcredentialstore.codeplex.com/

Then I used this commands:

git pull // I got an error on this step
git stash
git pull

more information about commands here:

http://git-scm.com/docs/git-pull

http://git-scm.com/book/en/Git-Tools-Stashing

http://git-scm.com/docs/git-commit

And as CharlesB said it is due to "conflict between your changes and the changes from another branch".


You have some uncommited changes. Commit or undo those changes and then Git "pull" will work.


I experienced this issue during a "pull" request via Visual Studio.

There was a change to a hidden file: .ntvs_analysis.dat

To discover this hidden file and remedy the problem, I:

  1. Showed hidden files† just to see if there were changes to files that I could not see.
  2. In the project directory, used Git GUI to undo the change to the hidden file that I found.

After that, my "pull" request was successful.


† Control Panel => Folder Options => View => Show hidden files and folders


I had this issue and the way I resolved it was by "brute force"...I had no changes to commit, and no commits to sync but still got this error while trying to pull in some changes that another developer pushed.

I ended up just whacking my local repo in the file system and re-cloning the remote branch. Voila!

Perhaps not the most elegant solution, but it works if you don't have any local changes that you are worried about losing.


Our environment requires us to not rely on Nuget auto package restore, and the problem I experienced was due to:

  • Some members only use GIT command console to commit / pull / push.
  • I rely on VS2013 Git tools to do Commit / pull /push.
  • The Git command console pushes all the content in the packages folder
  • Visual Studio tools ignores the packages folder

So the conflict was due to files in the packages folder trying to be added via the VS pull, but already existed on the HDD. For now I just deleted the relevant packages folder/files and redid the pull, that worked.

Hope this helps.


if you have some changes in local then you just commit your changes and dont sync this commit

changes => Enter a Commit Message => Commit and don't Sync this commit,then you can pull correctly

if you have not changes in your branch then go on Actions => Open Comment Prompt => then enter this lines

  1. git pull

  2. git stash

3.git pull


This sounds like the result of not adding executables and other auto generated output from Visual Studio to a .gitignore file. You don't want to be source controlling those files. More information on this here.


Need Your Help

What is the best way to implement nested dictionaries?

python data-structures dictionary mapping autovivification

I have a data structure which essentially amounts to a nested dictionary. Let's say it looks like this:

Karma + ui-router fails: Cannot read property 'isDefined' of undefined

javascript angularjs jasmine angular-ui karma-runner

I am using ui-router in my Angular project. For testing, I am using Karma and Jasmine.