Git force push failed
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.
Solution
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.
- Rename file for all commits in a Git repository
- git pull and resolve conflicts
- How to substitute text from files in git history?
- Define git alias with the same name to shadow original command
- Specify extras_require with pip install -e
- How do I rebase my PR without adding commits to it?
- Merge git repo into branch of another repo
- How to correct `git` reporting `detected dubious ownership in repository` without adding `safe.directory` when using WSL?
- Trouble setting up git with my GitHub Account error: could not lock config file
- In a Git repository, how to properly rename a directory?
- Git submodule push
- send-pack: unexpected disconnect while reading sideband packet when pushing to local git server
- Gerrit: configure similarity index threshold (renamed file)
- Git double revert : How to keep original author?
- Gitignore not working
- git submodule deinit not working as expected after submodule url change
- How can I find/identify large commits in Git history?
- How to fix : failed to push some refs to gitlab?
- Gitlab: webhook event on create branch
- Using "x AND y" instead of "x OR y" when using --grep twice in git-log
- Issues with commit message when pre-commit hook changes files
- Unstaged changes left after git reset --hard
- How to clone only a folder from a git submodule?
- How do I checkout a branch ignoring all local changes?
- Include only tracked files with npm publish
- Prevent Pull Request builds from triggering Continuous deployment trigger Azure DevOps Server
- Heroku/Git: protocol error: bad line length character: erro
- Add all files to a commit except a single file?
- Git Bash is extremely slow on Windows 7 x64
- How to delete a git working tree branch when its working directory has been removed?