Git冲突：commityourchangesorstashthembeforeyoucanmerge.

今天用git pull 代码时遇到如下错误：

error: Your local changes to the following files would be overwritten by merge:
Please commit your changes or stash them before you merge.

一般有两种处理方式：

1、提交自己本地的修改，然后pull

git stash
git pull
git stash pop

2、忽略本地修改，直接覆盖

git reset --hard
git pull