当我尝试推送更改时,Visual Studio 2013中的git是我的新手,我收到以下错误消息There are new remote changes. You must pull them before you can push.
,当我尝试获取更改时,我收到以下错误消息。
An error occurred. Detailed message: An error was raised by libgit2. Category = 21 (MergeConflict).
1 uncommitted change would be overwritten by merge
这似乎是一个错误。
我遇到了同样的问题,然后找到了此链接:http : //connect.microsoft.com/VisualStudio/feedbackdetail/view/955248/git-merge-fails-claiming-uncommited-change-would-be-overwrite-by-merge -ssh-mergeconflict
他们说这将在Visual Studio 2013 Update 4中修复。
(我应该注意,即使我没有本地未提交的文件,我也得到了它。)
本文收集自互联网,转载请注明来源。
如有侵权,请联系 [email protected] 删除。
我来说两句