git errot
1.错误信息
使用TortoiseGit执行pull命令时显示
git.exe pull --progress --no-rebase -v "origin"
fatal: unable to access 'https://github.com/konsumer/arduinoscope.git/': error setting certificate verify locations:
CAfile: D:\Program Files\Git\mingw64/bin/curl-ca-bundle.crt
CApath: none
git version 2.9.2.windows.1
解决方法
先打开git bash窗口
执行命令:
git config --system http.sslcainfo "C:\Program Files (x86)\git\bin\curl-ca-bundle.crt"
(注意修改为正确的文件路径)或
git config --system http.sslverify false
我使用git config --system http.sslverify false
命令解决问题。
参考文章
Github: error cloning my private repository
2.错误信息
You have not concluded your merge (MERGE_HEAD exists).
Exiting because of unfinished merge.
解释:错误可能是因为在你以前pull下来的代码没有自动合并导致的.
解决方法1:保留你本地的修改
git merge --abort
git reset --merge
解决方法2:抛弃本地更改
git fetch --all
git reset --hard origin/master
git fetch
3.错误信息
Some untracked working tree files would be overwritten by checkout. Please move or remove them before you can checkout. View them
解决方法2 git clean -d -fx