利用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

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 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>

 

你可能感兴趣的:(git工具,学习,工具使用)