本地有更改时,拉取remote分支报错:
An error was raised by libgit2. Category = 21 (MergeConflict).
1 uncommitted changes would be overwritten by merge
网上搜了一圈,有说是VS2013的bug
https://stackoverflow.com/questions/22697183/an-error-was-raised-by-libgit2-category-21-mergeconflict
https://q.cnblogs.com/q/64838/
尝试把更改里的“排除的更改”、“未跟踪的文件”删除掉,就可以了