github小记（二）：git pull错误error: Your local changes to the following files would be overwritten by merge

---

前言

github自用

从github代码库中拉取文件到本地：

git pull

结果提示：

sc19zx@server:~/xxxxxxxx/xxxx$ git pull
error: Your local changes to the following files would be overwritten by merge:
      1234/5678
Please commit your changes or stash them before you merge.
Aborting

1. git checkout

使用git checkout ...命令

git checkout 1234/5678