git上传本地工程到码云上,报错:
fushaolei@DESKTOP-50PGGOT MINGW64 /f/teach/xcEdu/xcEduUI01/xc-ui-pc-static-portal (master)
$ git push origin master
To https://gitee.com/wise_happy/xc-ui-pc-static-portal.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'https://gitee.com/wise_happy/xc-ui-pc-static-portal.git'
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.
原因是:码云仓库里面的文件和本地仓库里面的文件并没同步,如:README.en.md和README.md,所以才导致无法上传的。
解决方案是:
① git pull origin master --allow-unrelated-histories //使用这个指令,来把远程仓库和本地同步,消除两个文档间的差异,其实也 就是把.md文件下载下来
2、git add . --再把本地文件添加至上传出 git commit -m '提交' --上传文件 (重新add和commit相应文件)
3、git push origin master --将文件push至码云
4、此时就能够上传成功了