今天想把电脑上的本地项目经过Git
提交到Coding
上面,在Coding
上建立项目、初始化仓库并自动建立了README.md
文件,而后本地提交时执行git push
的时候,提示:git
To https://git.coding.net/xxxx/xxx.git ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'https://git.coding.net/xxxx/xxx.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.
提示push
失败,在push
执行须要执行pull
拉取远程代码。而后执行git pull origin master
:.net
From https://git.coding.net/xxxx/xxx * branch master -> FETCH_HEAD fatal: refusing to merge unrelated histories
意思是拒绝合并无联系的历史,代表本地和远程如今是两个不一样的项目。code
解决方案(使用其中一种便可)
针对refusing to merge unrelated histories
问题ip
#容许合并不相关的内容 $ git pull --allow-unrelated-histories #提交内容 $ git push
针对non-fast-forward
问题rem
#强推,本地代码强行覆盖远程`git`仓库 $ git push -f