Git Error3 Fixes Available

error: failed to push some refs (non-fast-forward)

error: failed to push some refs to 'https://github.com/user/repo.git' hint: Updates were rejected because the remote contains work that you do not have locally.

What does this error mean?

Someone else (or you from another machine) has pushed commits to the remote branch that you don't have locally. Git refuses to push because it would overwrite those remote changes.

Common Causes

Colleagues pushed changes to the same branch
You edited files directly on the GitHub/GitLab website
You have multiple machines and forgot to pull on one of them

How to Fix It (3 Solutions)

Pull and merge remote changes (The Safe Fix)

Fetch the remote changes and merge them into your local branch before pushing again.

Code

git pull origin main
# Fix any merge conflicts if they occur
git push origin main

Use Git Rebase for a cleaner history

Rebase your changes on top of the remote changes to keep a linear history.

Code

git pull --rebase origin main
git push origin main

Force push (Only if you are sure)

Overwrite the remote branch with your local branch. Warning: This deletes remote commits!

Code

git push --force origin main

Related Errors

Git

fatal: refusing to merge unrelated histories

View fix

Git

CONFLICT — Merge conflict in file

View fix

Git

You are in 'detached HEAD' state

View fix

Browse all error fixes