push to origin/master was rejected错误解决方案
发布日期:2021-05-08 23:20:39 浏览次数:21 分类:博客文章

本文共 1421 字,大约阅读时间需要 4 分钟。

push to origin/master was rejected错误解决方案

原因

初始化项目时,远程仓库自动建了某些文件,而本地仓库与远程仓库尚没有进行文件关联,因此需要将两个仓库的文件进行关联后提交。

操作步骤

切换到自己项目所在的目录

1.右键选择GIT BASH Here,Idea中可使用Alt+F12

2.在terminl窗口中依次输入命令:

git pull

git pull origin master

git pull origin master --allow-unrelated-histories

$ git pullwarning: no common commitsremote: Enumerating objects: 4, done.remote: Counting objects: 100% (4/4), done.remote: Compressing objects: 100% (4/4), done.remote: Total 4 (delta 0), reused 0 (delta 0), pack-reused 0Unpacking objects: 100% (4/4), done.From gitee.com:courage129/mybatis * [new branch]      master     -> origin/masterThere is no tracking information for the current branch.Please specify which branch you want to merge with.See git-pull(1) for details.    git pull 
If you wish to set tracking information for this branch you can do so with: git branch --set-upstream-to=origin/
master$ git pull origin masterFrom gitee.com:courage129/mybatis * branch master -> FETCH_HEADfatal: refusing to merge unrelated histories$ git pull origin master --allow-unrelated-historiesFrom gitee.com:courage129/mybatis * branch master -> FETCH_HEADerror: Your local changes to the following files would be overwritten by merge: .idea/compiler.xml .idea/encodings.xml .idea/inspectionProfiles/Project_Default.xml .idea/misc.xml .idea/workspace.xml Mybatis.iml

3.在idea中重新push自己的项目,成功!!

上一篇:Mybatis总结(一)
下一篇:JSON Web Token 入门教程

发表评论

最新留言

路过,博主的博客真漂亮。。
[***.116.15.85]2025年03月25日 03时26分29秒