Git Pull 更新到本地 和 本地文件有冲突的时候的3种处理方法

[ClarenceC]

Commit your changes or stash them before you can merge

当你本地的版本与远程仓库的版本不一样的时候,而你又想拉下来可以尝试这几种方法

1. Open New Branch

git checkout HEAD^ file/to/overwrite
git pull

2. Overwrite All Local file

git reset --hard
git pull

3.commit your changes befor you do the merge

git stash
git merge origin/master
git stash pop

4. pull remote and loacl

'git fetch -p'