Vfrdtyky

Did anyone try:

git push -f origin master

That should solve the problem.

EDIT: Based on @Mehdi ‘s comment below I need to clarify something about —force pushing. The git command above works safely only for the first commit. If there were already commits, pull requests or branches in previous, this resets all of it and set it from zero. If so, please refer @VonC ‘s detailed answer for better solution.

If you just used git init and have added your files with git add . or something similar and have added your remote branch it might be that you just haven't committed (git commit -m 'commit message') anything locally to push to the remote... I just had this error and that was my issue.

I had same problem. I was getting this problem because i had not made any commit not even initial commit and still i was trying to push.

Once i did git commit -m "your msg" and then everything worked fine.

I find the solution to this problem in github help.

You can see it from:Dealing with non-fast-forward errors

It says:

You can fix this by fetching and merging the changes made on the remote branch with the changes that you have made locally:

$ git fetch origin

# Fetches updates made to an online repository

$ git merge origin branch

# Merges updates made online with your local work

Or, you can simply use git pull to perform both commands at once:

$ git pull origin branch

# Grabs online updates and merges them with your local work

Rename your branch and then push, e.g.:

git branch -m new-name

git push -u new-name

This worked for me.

If you are using gerrit, this could be caused by an inappropriate Change-id in the commit. Try deleting the Change-Id and see what happens.

Not commiting initial changes before pushing also causes the problem

Remember to commit your changes before pushing to Github repo. This might fix your problem.

before push you have to add and commit the changes or do git push -f origin master

1)git init

2)git remote add origin https://gitlab.com/crew-chief-systems/bot

3)git remote -v (for checking current repository)

4)git add -A(add all files)

5)git commit -m 'Added my project'

6)git pull --rebase origin master

7) git push origin master

Not sure if this applies, but the fix for me was to commit something locally after git init. Then I pushed to remote using --set-upstream ...

Well if none of the above answers are working and if you have messed up something with ssh-add lately. Try

ssh-add -D

In my case, this error happened because there was some maintenance happening on our version of GitLab.

You can also fix it by editing the git config file of your project:

Where is it?

.git/config

Add the following lines at the end if they are not.

[branch "master"]
remote = origin
merge = refs/heads/master


This solved my problem

In my case closing of editor (visual studio code) solved a problem.

git error: failed to push some refs to also comes when the local repository name does match with the corresponding remote repository name. Make sure you are working on the correct pair of repository before you Pull changes to remote repository. In case you spell incorrectly and you want to remove the local repository use following steps

Remove the local repo from windows
1. del /F /S /Q /A .git
2. rmdir .git
3. Correct the local folder name(XXXX02->XXXX20) or if it is a newly created repo delete it and recreate the repo (XXXX02 Repo name changed to XXXX20).
4. git init
5. Remap with remote repo if it is not mapped.
6. git remote add origin https://github.com//XXXX20.git
7. git push -u origin master

Creating a new branch solved for me:

git checkout -b <nameOfNewBranch>

As expected no need to merge since previous branch was fully contained in the new one.

I faced with a similar problem, and I have tried the accepted answer. The result is a little different.

During my editing of the local repository, I modified the readme.md file in the GitHub webpage. As a result, when I try the command git pull --rebase origin master, the command line will remind me that

error: cannot pull with rebase: You have unstaged changes.

error: please commit or stash them.

So, I need to first execute the command git stash to store all modified files and then follow the accepted answer. After that, the locally committed files have been pushed to the Github repository. Finally, I execute the git stash pop to recover those files with unstaged changes.

In summary, the command sequence for me is

git stash

git pull --rebase origin master

git push origin master

git stash pop

As I currently cannot comment under the accepted answer, I added an answer to this question.