git 冲突最简单处理
error:The following untracked working tree files would be overwritten by merge:
将远程的全部pull过来
git reset --hard
git pull
把本地的藏起来,然后在远程pull过来
git stash
git pull
git stash pop
git diff -w filename
error:The following untracked working tree files would be overwritten by merge:
git reset --hard
git pull
git stash
git pull
git stash pop
git diff -w filename