Git冲突

Merge错误

使用以下三条git命令就可以将网上的覆盖

git stash
git pull
git stash pop

LF错误

CRLF will be replaced by LF in XXX . The file will have its original line endings in your working directory.

使用以下一条git命令就可去除转化

git config core.autocrlf false  //将设置中自动转换功能关闭