git更新：Your local changes to the following files would be overwritten by merge

• 具体错误

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