利用IDEA解決git push rejected問題方法

首先你要進入到當前項目所在的目錄,然後一下操作

第一步git pull
E:\code\cms>git pull
warning: no common commits
remote: Enumerating objects: 6, done.
remote: Counting objects: 100% (6/6), done.
remote: Compressing objects: 100% (6/6), done.
remote: Total 6 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (6/6), done.
From https://gitee.com/xuemeng2018/cms
 * [new branch]      master     -> origin/master
There 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 <remote> <branch>

If you wish to set tracking information for this branch you can do so with:

    git branch --set-upstream-to=origin/<branch> master

第二步git pull origin master
E:\code\cms>git pull origin master
From https://gitee.com/xuemeng2018/cms
 * branch            master     -> FETCH_HEAD
fatal: refusing to merge unrelated histories

第三步git pull origin master --allow-unrelated-histories

E:\code\cms>git pull origin master --allow-unrelated-histories
From https://gitee.com/xuemeng2018/cms
 * branch            master     -> FETCH_HEAD
Merge made by the 'recursive' strategy.
 .gitee/ISSUE_TEMPLATE.zh-CN.md        | 13 ++++++++++++
 .gitee/PULL_REQUEST_TEMPLATE.zh-CN.md | 15 ++++++++++++++
 README.md                             | 37 +++++++++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+)
 create mode 100644 .gitee/ISSUE_TEMPLATE.zh-CN.md
 create mode 100644 .gitee/PULL_REQUEST_TEMPLATE.zh-CN.md
 create mode 100644 README.md

E:\code\cms>

 

發表評論
所有評論
還沒有人評論,想成為第一個評論的人麼? 請在上方評論欄輸入並且點擊發布.
相關文章