如何强制推重置到远程存储库？

我们的远程主分支不知怎么搞砸了。当前的开发代码和最新的提交一起放在主分支上。显然，开发代码还没有为主分支做好准备。

因此，在我的本地存储库中，我重置了最新的标记 git reset --hard (Tag)。主分支现在在我的本地存储库上是正确的。现在，当我试图将更改推送到远程存储库 git push origin master时，我得到一个错误:

To (REMOTE GIT REPOSITORY LOCATION)
! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to '(REMOTE GIT REPOSITORY LOCATION)'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again.  See the
'Note about fast-forwards' section of 'git push --help' for details.

因此，在环顾四周后，我发现了 --force选项。因此，我向远程存储库 git push --force origin master进行了一次强制推送，但仍然得到一个错误:

Total 0 (delta 0), reused 0 (delta 0)
remote: error: denying non-fast-forward refs/heads/master (you should pull first)
To (REMOTE GIT REPOSITORY LOCATION)
! [remote rejected] master -> master (non-fast-forward)
error: failed to push some refs to '(REMOTE GIT REPOSITORY LOCATION)'

我不能对 master 进行拉动操作，因为它包含不能在 master 上进行的开发代码。

103413 次浏览
小开

Try using the -f flag and putting it after the remote branch name.

git push origin master -f

小开

The remote doesn't allow non-fast-forwards.

Your best option is to git revert all of the commits that shouldn't be there and be more careful in future.

git revert [commit] will create a new commit that undoes whatever [commit] did.

小开

The message means that you're not allowed to do non-fast-forward push.

Your remote repository has most likely denyNonFastforwards = true in its config. If you change that, git push --force should work.

To change the setting, you need access to the machine with the remote repository. From there, do git config receive.denynonfastforwards false.

小开

The problem occurs as the current branch isn't configured properly for the PULL. First check whether the upstream branch is properly configured for the pull using - git remote show origin. You can find it under the section - Local branches configured for 'git pull':. If not, configure it using:

git config branch.MYBRANCH.merge refs/heads/MYBRANCH

Give appropriate branch name for the place holder - MYBRANCH

小开

Steps to permanently enable force push in the following style

git push -f myrepo my-branch

Edit the file named "config" in the folder ending in ".git" on your remote repository

In git's command-line output from the failed push, look for the line that says something like:

error: failed to push some refs to 'ssh://user@some-remote-server.mycompany.com/srv/git/myrepo.git

then

ssh user@some-remote-server.mycompany.com
cd /srv/git/myrepo.git
vi config

Set "denyNonFastforwards" to false

In "config", set 

[receive]
denyNonFastforwards = false

Now you can push from your local machine with -f

git push -f myrepo my-branch
小开

You're not allowed to do git push that is not fast-forward.

  1. If the remote is GitHub, go to https://github.com/$USER/$REPO/settings/branches and un-protect the branch in question.

    enter image description here

    You have to be admin of the repo to do that.

  2. If the remote is your own git server, run git config receive.denynonfastforwards false there.

小开

I'm using this group of commands to reset my remote repo, this will re-initialize your local repo and relink with your remote repo then force push the updates.

I think this way won't work in your case, but may be useful for someone else

go to the source folder then run the commands : note that https://github.com/*.git is your remote repo link

git init
git remote add origin https://github.com/*.git
git add .
git commit -m "initial commit"
git push origin master -f
git push --set-upstream origin master

**Note: this will clear all your git history on your master branch**

小开

The best way around this is to delete the remote branch and re-send it:

git push origin master --delete
git push origin master
小开

For me, @svick 's hint pointed in the right direction. Since the git server I wanted to modify is actually my box, I logged into it and did a git config --global receive.denynonfastforwards false to change all repos to accept a forced non-ff push. Didn't work out of the box. What I found was that in the config there already was receive.denynonfastforwards=true set, and it couldn't be erased with git config --global --unset receive.denynonfastforwards. Doing the edit in the repo manually (vi config) worked, though.

小开

I solved by removing the master branch from protected and also default which is just over proted branch rules in setting of a repository.


提交答案