git pull 时 Automatic merge failed; fix conflicts and then commit the result.
分析git pull的原理，实际上git pull是分了两步…
LF will be replaced by CRLF in tool/js/tool/index.js.The file will have its original line endings in your working directory.
【原因】 windows中的换行符为 CRLF， 而在Lin…
Git push冲突 Updates were rejected because the tip of your current branch is behind
Git push 冲突 Updates were rejec…