需要刪除原來的.git 文件? 重新生成一次

強行覆蓋遠程的gitlab ?出錯??

我這里出錯的原因是 因為我本地一個readme.md和遠程的README.MD文本內容不同

我將本地的readme.md 刪除后重新操作就對了

1.刪除原來的.git文件

Administrator@USER-20170819XG MINGW64 /e/unicomWorkSpace/demoproject_GitLab
$ git init
Initialized empty Git repository in E:/unicomWorkSpace/demoproject_GitLab/.git/

Administrator@USER-20170819XG MINGW64 /e/unicomWorkSpace/demoproject_GitLab (master)
$ git status
On branch master

No commits yet

Untracked files:
? (use "git add <file>..." to include in what will be committed)

? ? ? ? .gitignore
? ? ? ? 1.txt
? ? ? ? 2.txt
? ? ? ? pom.xml
? ? ? ? readme.md
? ? ? ? readme.txt
? ? ? ? src/

nothing added to commit but untracked files present (use "git add" to track)

Administrator@USER-20170819XG MINGW64 /e/unicomWorkSpace/demoproject_GitLab (master)
$ git add .
warning: LF will be replaced by CRLF in .gitignore.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in pom.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/unicom/DemoprojectApplication.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/resources/application.yml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/test/java/com/unicom/DemoprojectApplicationTests.java.
The file will have its original line endings in your working directory.

Administrator@USER-20170819XG MINGW64 /e/unicomWorkSpace/demoproject_GitLab (master)
$ git status
On branch master

No commits yet

Changes to be committed:
? (use "git rm --cached <file>..." to unstage)

? ? ? ? new file: ? .gitignore
? ? ? ? new file: ? 1.txt
? ? ? ? new file: ? 2.txt
? ? ? ? new file: ? pom.xml
? ? ? ? new file: ? readme.md
? ? ? ? new file: ? readme.txt
? ? ? ? new file: ? src/main/java/com/unicom/DemoprojectApplication.java
? ? ? ? new file: ? src/main/java/com/unicom/common/ResultVOUtil.java
? ? ? ? new file: ? src/main/java/com/unicom/common/ResultVo.java
? ? ? ? new file: ? src/main/java/com/unicom/common/resut.java
? ? ? ? new file: ? src/main/java/com/unicom/controller/UserController.java
? ? ? ? new file: ? src/main/java/com/unicom/dao/UserMapper.java
? ? ? ? new file: ? src/main/java/com/unicom/dataobject/User.java
? ? ? ? new file: ? src/main/java/com/unicom/repository/UserRepository.java
? ? ? ? new file: ? src/main/java/com/unicom/service/UserService.java
? ? ? ? new file: ? src/main/java/com/unicom/service/impl/UserServiceImpl.java
? ? ? ? new file: ? src/main/java/com/unicom/w.java
? ? ? ? new file: ? src/main/resources/application.yml
? ? ? ? new file: ? src/main/resources/mapper/UserMapper.xml
? ? ? ? new file: ? src/test/java/com/unicom/DemoprojectApplicationTests.java
? ? ? ? new file: ? src/test/java/com/unicom/repository/UserRepositoryTest.java

Administrator@USER-20170819XG MINGW64 /e/unicomWorkSpace/demoproject_GitLab (master)
$ git commit -am 'first'
[master (root-commit) 3925749] first
?21 files changed, 623 insertions(+)
?create mode 100644 .gitignore
?create mode 100644 1.txt
?create mode 100644 2.txt
?create mode 100644 pom.xml
?create mode 100644 readme.md
?create mode 100644 readme.txt
?create mode 100644 src/main/java/com/unicom/DemoprojectApplication.java
?create mode 100644 src/main/java/com/unicom/common/ResultVOUtil.java
?create mode 100644 src/main/java/com/unicom/common/ResultVo.java
?create mode 100644 src/main/java/com/unicom/common/resut.java
?create mode 100644 src/main/java/com/unicom/controller/UserController.java
?create mode 100644 src/main/java/com/unicom/dao/UserMapper.java
?create mode 100644 src/main/java/com/unicom/dataobject/User.java
?create mode 100644 src/main/java/com/unicom/repository/UserRepository.java
?create mode 100644 src/main/java/com/unicom/service/UserService.java
?create mode 100644 src/main/java/com/unicom/service/impl/UserServiceImpl.java
?create mode 100644 src/main/java/com/unicom/w.java
?create mode 100644 src/main/resources/application.yml
?create mode 100644 src/main/resources/mapper/UserMapper.xml
?create mode 100644 src/test/java/com/unicom/DemoprojectApplicationTests.java
?create mode 100644 src/test/java/com/unicom/repository/UserRepositoryTest.java

Administrator@USER-20170819XG MINGW64 /e/unicomWorkSpace/demoproject_GitLab (master)
$ git remote add origin https://gitlab.com/yangjiabin/demo.git

Administrator@USER-20170819XG MINGW64 /e/unicomWorkSpace/demoproject_GitLab (master)
$ git branch
* master

Administrator@USER-20170819XG MINGW64 /e/unicomWorkSpace/demoproject_GitLab (master)
$ git branch -r? ? 這里查詢不到? ?在http情況下要? git push之后? （需要輸入用戶名密碼才行）? ? ?

Administrator@USER-20170819XG MINGW64 /e/unicomWorkSpace/demoproject_GitLab (master)
$ git push -u origin master
To https://gitlab.com/yangjiabin/demo.git
?! [rejected] ? ? ? ?master -> master (fetch first)
error: failed to push some refs to 'https://gitlab.com/yangjiabin/demo.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

Administrator@USER-20170819XG MINGW64 /e/unicomWorkSpace/demoproject_GitLab (master)
$ git push -u -f origin master? ? ? ? ? ? ? ?這里需要輸入用戶名和密碼
Counting objects: 39, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (26/26), done.
Writing objects: 100% (39/39), 9.21 KiB | 314.00 KiB/s, done.
Total 39 (delta 1), reused 0 (delta 0)
remote: GitLab: You are not allowed to force push code to a protected branch on this project.
To https://gitlab.com/yangjiabin/demo.git
?! [remote rejected] master -> master (pre-receive hook declined)
error: failed to push some refs to 'https://gitlab.com/yangjiabin/demo.git'

Administrator@USER-20170819XG MINGW64 /e/unicomWorkSpace/demoproject_GitLab (master)
$

Administrator@USER-20170819XG MINGW64 /e/unicomWorkSpace/demoproject_GitLab (master)
$ git pull
warning: no common commits
remote: Enumerating objects: 3, done.
remote: Counting objects: 100% (3/3), done.
remote: Total 3 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.
From https://gitlab.com/yangjiabin/demo
?* [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

Administrator@USER-20170819XG MINGW64 /e/unicomWorkSpace/demoproject_GitLab (master)
$ git push -u -f origin master
Counting objects: 39, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (26/26), done.
Writing objects: 100% (39/39), 9.21 KiB | 294.00 KiB/s, done.
Total 39 (delta 1), reused 0 (delta 0)
remote: GitLab: You are not allowed to force push code to a protected branch on this project.
To https://gitlab.com/yangjiabin/demo.git
?! [remote rejected] master -> master (pre-receive hook declined)
error: failed to push some refs to 'https://gitlab.com/yangjiabin/demo.git'

Administrator@USER-20170819XG MINGW64 /e/unicomWorkSpace/demoproject_GitLab (master)
$ git pull --rebase origin master
From https://gitlab.com/yangjiabin/demo
?* branch ? ? ? ? ? ?master ? ? -> FETCH_HEAD
First, rewinding head to replay your work on top of it...
Applying: first
.git/rebase-apply/patch:641: new blank line at EOF.
+
.git/rebase-apply/patch:681: new blank line at EOF.
+
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...

Administrator@USER-20170819XG MINGW64 /e/unicomWorkSpace/demoproject_GitLab (master)
$ git pull --rebase origin master
error: cannot pull with rebase: You have unstaged changes.
error: please commit or stash them.

Administrator@USER-20170819XG MINGW64 /e/unicomWorkSpace/demoproject_GitLab (master)
$ git status
On branch master
Changes not staged for commit:
? (use "git add/rm <file>..." to update what will be committed)
? (use "git checkout -- <file>..." to discard changes in working directory)

? ? ? ? deleted: ? ?README.md
? ? ? ? deleted: ? ?readme.md

no changes added to commit (use "git add" and/or "git commit -a")

Administrator@USER-20170819XG MINGW64 /e/unicomWorkSpace/demoproject_GitLab (master)
$ git add .

Administrator@USER-20170819XG MINGW64 /e/unicomWorkSpace/demoproject_GitLab (master)
$ git status
On branch master
Changes to be committed:
? (use "git reset HEAD <file>..." to unstage)

? ? ? ? deleted: ? ?README.md
? ? ? ? deleted: ? ?readme.md

Administrator@USER-20170819XG MINGW64 /e/unicomWorkSpace/demoproject_GitLab (master)
$ git commit -am '1'
[master 2f9c9e3] 1
?2 files changed, 1 deletion(-)
?delete mode 100644 README.md
?delete mode 100644 readme.md

Administrator@USER-20170819XG MINGW64 /e/unicomWorkSpace/demoproject_GitLab (master)
$ git pull
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

Administrator@USER-20170819XG MINGW64 /e/unicomWorkSpace/demoproject_GitLab (master)
$ git pull --rebase origin master
From https://gitlab.com/yangjiabin/demo
?* branch ? ? ? ? ? ?master ? ? -> FETCH_HEAD
Current branch master is up to date.

Administrator@USER-20170819XG MINGW64 /e/unicomWorkSpace/demoproject_GitLab (master)
$ git push -u -f origin master
Counting objects: 41, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (28/28), done.
Writing objects: 100% (41/41), 9.44 KiB | 322.00 KiB/s, done.
Total 41 (delta 2), reused 0 (delta 0)
To https://gitlab.com/yangjiabin/demo.git
? ?aba7fa8..2f9c9e3 ?master -> master
Branch 'master' set up to track remote branch 'master' from 'origin'.

Administrator@USER-20170819XG MINGW64 /e/unicomWorkSpace/demoproject_GitLab (master)
$
?

?

?

?

?

?

?

?

?

?

?

?

?

?

?

?

?

?

?

?

?

?

?

! [remote rejected] master -> master (pre-receive hook declined)

2018年08月28日 19:17:57?北京流年?閱讀數 3210

?版權聲明：本文為博主原創文章，未經博主允許不得轉載。 https://blog.csdn.net/u010648159/article/details/82153119

! [remote rejected] master -> master (pre-receive hook declined)
error: failed to push some refs to ‘https://code.xxxx.com.cn/xxxx/xxxx-Android.git’
出現這個問題的原因是遠程庫和本地庫不一致造成的，那么我們把遠程庫同步到本地庫就可以了

解決辦法

git pull --rebase origin master

這行指令的意思是把遠程庫中的更新合并到本地庫中，-rebase的作用是取消本地庫中剛剛的commit，
并把他們接到更新后的版本庫之中。

轉型人工智能！如何打造屬于自己的“offer收割機”？

實戰講師總結AI人工智能學習路線規劃，進軍人工智能領域程序員免費領！

• qq_42462576：?執行該命令之后還是報同樣的錯誤(2周前#1樓)查看回復(1)

創作挑戰賽新人創作獎勵來咯，堅持創作打卡瓜分現金大獎

總結

以上是生活随笔為你收集整理的强行覆盖远程的gitlab 出错的全部內容，希望文章能夠幫你解決所遇到的問題。

如果覺得生活随笔網站內容還不錯，歡迎將生活随笔推薦給好友。