I am new to git in visual studio 2013 when i try to push changes i got the following error messages saying There are new remote changes. You must pull them before you can push.and when i try to pull the changes i get.
An error occurred. Detailed message: An error was raised by libgit2. Category = 21 (MergeConflict).
1 uncommitted change would be overwritten by merge
This appears to be a bug.
I had the same issue and then found this link: http://connect.microsoft.com/VisualStudio/feedbackdetail/view/955248/git-merge-fails-claiming-uncommited-change-would-be-overwritten-by-merge-ssh-mergeconflict
They say this will be fixed with Visual Studio 2013 Update 4.
(I should note that I was getting this even though I had no local uncommitted files.)
Collected from the Internet
Please contact [email protected] to delete if infringement.
Comments