Menu
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?
978
Conflict occurs when your changes cannot be merged with what is coming in because the changes are essentially on the same line. You have two options either to revert your change or manually merge the changes and commit it later.
You can choose an existing local or remote branch as the base. The Checkout branch checkbox automatically switches you to the newly created branch. The equivalent command for this action is git checkout -b <new-branch><existing-branch> .
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".
188
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
