首先是time out 现在办公的地方的网很差,所以没办法解决: 其次是: git remote add origin https://时报错,需要把origin删除掉
error: failed to push some refs to hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: ‘git pull …’) before pushing again. hint: See the ‘Note about fast-forwards’ in ‘git push –help’ for details. 这个错误是远程库和本地内容有冲突,需要先吧远程的内容用另外一个分支存到本地,然后合并两个分支 1、把远程仓库master分支下载到本地并存为tmp分支 git fetch origin master:tmp 2、查看tmp分支与本地分支的不同 git diff tmp 3、将tmp分支和本地的master分支合并加(加上的–allow-unrelated-histories理由是可能会报fatal: refusing to merge unrelated histories的错) git merge tmp –allow-unrelated-histories 这个时候呢,本地与远程就没有冲突了 4、最后删除tmp分支 git branch -d tmp