DEAR PEOPLE FROM THE FUTURE: Here's what we've figured out so far...

Welcome! This is a Q&A website for computer programmers and users alike, focused on helping fellow programmers and users. Read more

What are you stuck on? Ask a question and hopefully somebody will be able to help you out!
+2 votes

I want to push my commits to a remote, but some files in the remote were modified from github (online). Github has created new commits but I do not want to keep them around. I want to push to my repository and replace all the changes that were done from the website. I cannot push because of this error

 ! [rejected]        master -> master (fetch first)
error: failed to push some refs
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.

I do not want to integrate the remote changes, I just want to push my local version.


1 Answer

+1 vote
Best answer

You can probably do a force push: git push -f [remote] [branch]

Side note: if you are pushing to a protected branch (e.g. main or master are often protected by default on git hosts), make sure you have permission or temporarily disable the branch protection in the repository settings.

selected by
Contributions licensed under CC0