git创建仓库并上传代码文件
Git bash上传
git init //初始化仓库
git add .(文件name) //添加文件到本地仓库
git commit -m “first commit” //添加文件描述信息
git remote add origin + https://github.com/sekkkey/code.git //链接远程仓库,创建主分支
git push -u origin master //把本地仓库的文件推送到远程仓库
存在的bug
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to ‘https://github.com/sekkkey/code.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.
为了解决bug,在最后一步之前使用git pull origin master。
git init
git add .
git commit -m “first commit”
git remote add origin https://github.com/sekkkey/code.git
git push origin master
git push -u origin master
但是bug依然存在,问题没有解决。通过参考链接的提示得到解决方案
问题可能在于远程分支上存在本地分支中不存在的提交,往往是多人协作开发过程中遇到的问题,可以先fetch再merge,也就是pull,把远程分支上的提交合并到本地分支之后再push。
如果你确定远程分支上那些提交都不需要了,那么直接git push origin master -f,强行让本地分支覆盖远程分支
git push origin master -f