git pull 冲突

1. 问题描述

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

2. 解决方案

2.1 stash

git stash
git pull
git stash pop

2.2 放弃本地修改

git reset --hard
git pull