Push the local project to the remote repository

IDEA中推送

The local repository is the same as the remote repository

创建本地仓库

If this step is not set,IDEAwill be displayed in the top menuVCS,而不会显示Git功能

依次打开：文件 | 设置 | 版本控制 | 目录映射;Map the current project path to Git仓库

The English version corresponds to the address：

提交本地项目

将本地项目提交到本地仓库（git add–>git commit）;

关联远程仓库

点击Git–>管理远程

英文版对应：

添加远程仓库地址,You can also customize aliases

Pull the remote warehouse project to the local

Git–>拉取（pull）

Select the branch to pull from,如果没有出现,按照提示,多刷新几次

将本地仓库项目推送到远程仓库

Git–>推送（push）

The local repository is inconsistent with the remote repository

If the local repository is inconsistent with the remote repository,Then all local operations are the same as before.The only difference is that various errors will be reported due to the inconsistency between the local repository and the remote repository during the final pull and push.

以防万一,You can create a new temporary branch before proceeding,Make a backup of the local branch

首先是Git拉取失败,报错：

Git 拉取失败
From github.com:ooahz/XXXX

refusing to merge unrelated histories

复制

The reason is naturally because the local library is inconsistent with the remote library. 解决方法： 点击：Git–>更新项目

Choose to merge the current branch

提示无法更新,Follow the prompts to choose the upstream branch,

Also after selecting the branch,选择合并

Then you can see that the remote repository is successfully downloaded to the local,But it is not related to the local project,So we need to merge the projects

Click on the remote repository branch,Then choose any option that will merge the remote branch into the local project branch（My choice here is to merge and pull in）

A warehouse inconsistency message appears,Select Rebase（Rebase）到远程 根据提示,Resolve all conflicts

然后推送即可

使用Git推送

The local repository is the same as the remote repository

创建本地仓库

$ git init

复制

提交本地项目

$ git add .

$ git commit -m "commit"

复制

关联本地项目

$ git remote add origin "远程仓库地址"

复制

Pull the remote project to the local

$ git pull origin master

复制

将本地项目提交到远程仓库

$ git push origin master

复制

The local repository is inconsistent with the remote repository

If the local repository is inconsistent with the remote repository,Then all local operations are the same as before.The only difference is that various errors will be reported due to the inconsistency between the local repository and the remote repository during the final pull and push.The solution is naturally to synchronize the local library and the remote library to be consistent. 图文说明：

以防万一,You can create a new temporary branch before proceeding,Make a backup of the local branch

git pull报错：

fatal: refusing to merge unrelated histories

复制

git push报错：

![rejected]
master -> master (non-fast -forward)
error: failed to push some refs to g1 thub. com: ooahz/webspider.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.

复制

Here are three solutions：

方法一

和上面的的IDEA的解决方法一样,使用rebae.

$ git pull --rebase origin master

复制

Merge remote repository updates into （pull=fetch+merge）本地库中,rebaseIndicates the last time of the native librarycommittransfer topulllater in the native library

图片说明：

使用该命令后,如有冲突,会提示合并冲突,After manually merging the conflicts, subsequent ones can proceed normallypush操作. Enter the command after merging the conflicts,检查是否完成：

git rebase --continue

复制

然后正常提交

方法二

$ git pull origin master --allow-unrelated-histories

复制

allow-unrelated-historiesIndicates that irrelevant historical commits are allowed,强制合并

It is also necessary to manually merge conflicts during the merge process Enter the command after merging the conflicts,检查是否完成：

git rebase --continue

复制

方法三

$ git push --force origin master 

复制

force表示强制提交