git报错记录

Q：The file will have its original line endings in your working directory. S： git rm -r –cached ./ git config core.autocrlf false git add ./   Q: You have not concluded your merge (MERGE_HEAD exists). Please, commit your changes before you can merge. Analytical : 错误可能是因为以前pull下来的代码没有自动合并导致的 S: 1.保留你本地的修改 git merge –abortgit reset –merge 合并后记得一定要提交这个本地的合并，然后..