Git force push failed

Question

I am trying to hard reset the master branch, so it mirrors the current state of our ‘develop’ branch.

We do not care for any old commits on master and want to rewrite it’s history. I should note, that we are using a self-hosted Git server called ‘SCM-Manager’ (no GitHub or similar services). I do have ‘owner’ privileges on the repository.

I am using the following command to force push the Develop’s state to Master:

git push origin +develop:master --no-verify --force

But I keep getting this error message:

! [rejected]            develop -> master (non-fast-forward)
error: failed to push some refs to 'https://****.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.

Any help is highly appreciated.

The master -> master in the error message means your Git attempted to set their master to the same commit hash that is stored in your master. But your git push origin +develop:master should have your Git using the hash stored in your develop. Something here does not add up, in other words. — torek
– torek, Commented May 13, 2019 at 9:55
@torek You are right, the error message I provided was generated with my head on master. I edited the question, but the problem remains. — Jonas_Hess
– Jonas_Hess, Commented May 13, 2019 at 10:03
Should I approach this differently, like deleting the master branch and then recreating it from develop? — Jonas_Hess
– Jonas_Hess, Commented May 13, 2019 at 10:08
Have you checked the receive.denyFastForwards git config variable in your server repo? This config variable could cause the server repo to reject. I don't think this is the case, though, because the error message is (at least for me) different when the push is rejected because of that config variable. — Alderath
– Alderath, Commented May 13, 2019 at 10:52
Just to be sure, this is not about the order of paramters? I.e. --force that has to be in front of [<repository> [<refspec>…]], like in git push --no-verify --force origin +develop:master. — kowsky
– kowsky, Commented May 13, 2019 at 10:59

Jonas_Hess · Accepted Answer · 2019-05-13 11:44:48Z

0

I solved the issue by removing the ‘master’ branch as the default branch in the SCM-Manager console.

This allowed me to delete and then recreate the branch as a copy of the 'develop' branch.

answered May 13, 2019 at 11:44

Jonas_Hess

2,0782 gold badges26 silver badges36 bronze badges

Sign up to request clarification or add additional context in comments.

Collectives™ on Stack Overflow

Git force push failed

1 Answer 1

Comments

Your Answer

Hot Network Questions

Collectives™ on Stack Overflow

1 Answer 1

Comments

Your Answer

Sign up or log in

Post as a guest

Related