git拉取报错
error: Your local changes to the following files would be overwritten by merge:
xxxxx/xxxx.cs
Please commit your changes or stash them before you merge.
通常遇到这个问题,你可以直接commit你的修改。
也可以:
进行暂存,然后拉取合并,然后再弹出暂存,继续修改。
文章标题: Git冲突:commit your changes or stash them before you can merge.
这篇文章写得很好,建议参考。