Git总结笔记4-git push origin master 报错的解决方法

Posted 2020-09-18

 1 错误提示如下：
 2 [[email protected] php]# git push -u origin master
 3 To [email protected]:kangvcar/Results-Systems--PHP.git
 4  ! [rejected]        master -> master (fetch first)
 5 error: failed to push some refs to ‘[email protected]:kangvcar/Results-Systems--PHP.git‘
 6 hint: Updates were rejected because the remote contains work that you do
 7 hint: not have locally. This is usually caused by another repository pushing
 8 hint: to the same ref. You may want to first merge the remote changes (e.g.,
 9 hint: ‘git pull‘) before pushing again.
10 hint: See the ‘Note about fast-forwards‘ in ‘git push --help‘ for details.

原因： 

GitHub远程仓库中的README.md文件不在本地仓库中。

 

解决方案1：

我们只需加上 -f 参数即可push成功。

 1 [[email protected] qimo]# git push -f
 2 warning: push.default is unset; its implicit value is changing in
 3 Git 2.0 from ‘matching‘ to ‘simple‘. To squelch this message
 4 and maintain the current behavior after the default changes, use:
 5 
 6   git config --global push.default matching
 7 
 8 To squelch this message and adopt the new behavior now, use:
 9 
10   git config --global push.default simple
11 
12 See ‘git help config‘ and search for ‘push.default‘ for further information.
13 (the ‘simple‘ mode was introduced in Git 1.7.11. Use the similar mode
14 ‘current‘ instead of ‘simple‘ if you sometimes use older versions of Git)
15 
16 Counting objects: 53, done.
17 Compressing objects: 100% (53/53), done.
18 Writing objects: 100% (53/53), 1.35 MiB | 55.00 KiB/s, done.
19 Total 53 (delta 8), reused 0 (delta 0)
20 remote: Resolving deltas: 100% (8/8), done.
21 To [email protected]:kangvcar/Results-Systems--PHP.git
22  + fbe05e8...70b187d master -> master (forced update)

解决方案2：

我们只需加上 --rebase 参数然后再重新 push 一次即可。

1 [[email protected] qimo]# git pull --rebase origin master
2 [[email protected] qimo]# git push -u origin master