git更新:Your local changes to the following files would be overwritten by merge
原创
©著作权归作者所有:来自51CTO博客作者柳鲲鹏泰山的原创作品,请联系作者获取转载授权,否则将追究法律责任
error: Your local changes to the following files would be overwritten by merge:
src/sfnt/ttcolr.c
Please commit your changes or stash them before you merge.
Aborting
# 丢弃所有本地未提交的修改
git checkout .
# 暂存到堆栈区
git stash
# 查看stash内容
git stash list