Reputation: 91686

Updates were rejected because the tip of your current branch is behind its remote counterpart

Our workflow is such. We have a branch called dev which I can reach at origin/dev. When we do changes, we create a branch off dev:

git checkout -b FixForBug origin/dev

Now I have a branch called FixForBug which is tracking (I think that's the right word) origin/dev. Thus, if I do a git pull it'll bring in new changes from origin/dev which is great. Now, when I'm finished with my fix, I push to a remote branch called the same thing.

First I pull down any changes from origin/dev and do a rebase:

git pull --rebase

Then I push the changes to a remote branch of the same name:

git push origin FixForBug

Now, there's a branch on the remote server and I can create a pull request for that change to be approved and merged back in to the dev branch. I don't ever push anything to origin/dev myself. I'm guessing this is as pretty common workflow.

The first time I do a git push, it works fine and creates the remote branch. However, if I push a second time (let's say during code-review, someone points out a problem), I get the following error:

error: failed to push some refs to 'https://github.mydomain.info/Product/product.git'
hint: Updates were rejected because the tip of your current branch is behind its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again.
See the 'Note about fast-forwards' in 'git push --help' for details.

However, if I do a git status it says I'm ahead of origin/dev by 1 commit (which makes sense) and if I follow the hint and run git pull, it says everything is up to date. I think this is because I'm pushing to a different branch than my upstream branch. I can fix this issue by running:

git push -f origin FixForBug

In that case, it'll push the changes to the remote branch, saying (forced update) and everything appears to be good on the remote branch.

My Questions:

Why is -f required in this scenario? Usually when you're forcing something, it's because you were doing something wrong or at least against standard practice. Am I ok doing this, or will it mess up something in the remote branch or create a hassle for whoever has to eventually merge my stuff into dev?

Upvotes: 921

Answers (30)

funerr

Reputation: 8176

I was just on the wrong branch, when I did git checkout main and pulled, it worked to push.

Upvotes: -1

runlevel0

Reputation: 2983

I have an interesting case: Got this message with a branch that was not yet on the remote, I just created it, edited, commited, tried a push --upstream, bam! interesting

Upvotes: 1

Golam Sorwar

Reputation: 1615

Set the current branch name, like master:

git pull --rebase origin master
git push origin master

Or branch name develop

git pull --rebase origin develop
git push origin develop

Upvotes: 78

Mariusz Sidorowicz

Reputation: 366

if you renamed from master to main do: git push --set-upstream origin main

Upvotes: 0

Azade Rahmati

Reputation: 207

in android studio on the right bottom checkout to master/origin branch

Upvotes: -1

Pavithran Ravichandiran

Reputation: 1899

Nothing worked for me in my organization's GitLab. I ended up using the following commands from my featureBranch

Run the following commands in the feature branch

git pull origin featureBranch --rebase

If you have any conflicts, after resolving conflicts:

git rebase --continue
Enter commit messages -> press ESC -> enter “:wq!” and enter
git push origin featureBranch

Upvotes: 11

PSAnkit58

Reputation: 56

Over here when you are trying to rebase a dev-feature branch from the master branch (Git version for reference >> git version git version 2.37.1 (Apple Git-137.1) )

1.git checkout dev-feature

checkout the feature branch

2. git pull

update the head to the latest commit

3. git pull --rebase origin master

set up the rebase flag to pull from the master repo

4. git config pull.rebase true in case the reconcile method is not set , since you have 2 divergent branches 5. git pull Successfully rebased and updated refs/heads/dev-feature** if you get the above message it means the branch has been rebased

6. git push origin dev-feature Push these changes to remote

Upvotes: 2

Jiao

Reputation: 121

your local master branch: -> HEAD~N -> updated & new files(can't push to github!)

your github master branch: -> HEAD~N -> AheadNewCommit1 -> AheadNewCommit2 ...

step1. reset to the HEAD~N

$  git reset --soft HEAD~N

step2: pull AheadNewCommit1 -> AheadNewCommit2 ... to your local master branch

$  git pull origin master

Upvotes: 0

havryliuk

Reputation: 311

I have encountered this problem in an automated environment only, namely Gitlab pipelines and Github actions, when during releases branches are merged and pushed automatically. The only manual solution that has worked for me is creating a new branch with the same changes and running the pipeline on the new branch.

I haven't yet figured out how to permenently fix it in Gitlab and Github pipelines.

Upvotes: 0

MagicLuckyCat

Reputation: 344

Check your remote branch isn't locked.

Upvotes: 0

surender pal

Reputation: 515

First, you have to fetch the changes from the remote, only then you will be able to push the changes, In order to do that you have to write the command

git pull

after that, you will find some conflict, resolve your conflict and then write the command

git push

This fix is working for me, give it a try and I think due to the conflict on the remote we are not able to push the code

Upvotes: -4

Talha Rafique

Reputation: 5928

*"The tip of your current branch is behind its remote counterpart"* means that there have been changes on the remote branch that you don’t have locally. And Git tells you to import new changes from REMOTE and merge it with your code and then push it to remote.

You can use this command to force changes to the server with the local repository (). remote repo code will be replaced with your local repo code.

git push -f origin master

With the -f tag you will override the remote branch code with your local repo code.

Upvotes: 564

Erick Lanford Xenes

Reputation: 1572

If you use TortoiseGit push dialogue

Cite source: https://tortoisegit.org/docs/tortoisegit/tgit-dug-push.html#id692368

known changes - This allows remote repository to accept a safer non-fast-forward push. This can cause the remote repository to lose commits; use it with care. This can prevent from losing unknown changes from other people on the remote. It checks if the server branch points to the same commit as the remote-tracking branch (known changes). If yes, a force push will be performed. Otherwise it will be rejected. Since git does not have remote-tracking tags, tags cannot be overwritten using this option. This passes --force-with-lease option of git push command.

unknown changes - This allows remote repository to accept an unsafe non-fast-forward push. This can cause the remote repository to lose commits; use it with care. This does not check any server commits, so it is possible to lose unknown changes on the remote. Use this option with Include Tags to overwrite tags. This passes the traditional --force option of git push command.

Upvotes: 3

iLearn

Reputation: 1189

If you are really worried about any other approaches, these Steps can help you without any difficutly

1: Stash your changes in your Local Branch that you want to Push

2: Rename Your Local Branch as your Backup for future

3: Create a Branch of the Same name From your Remote that will have all the changes

4: Check out this new Branch as your New Local Branch

5: Make and Save the Changes in this Branch

6: Commit and Push

Upvotes: 5

Davis Benny

Reputation: 129

In my case, the remote repository already had a branch with the same name as the dev branch that I was working on. I just renamed the branch and pushed the code. It worked for me.

git checkout -b new-branch-name
git push origin new-branch-name

Upvotes: 7

Sachin Mewar

Reputation: 513

We can force changes to GitHub using our local repository with the following cmd:

git push -f origin main

Upvotes: 32

gleitonfranco

Reputation: 799

It depends on the permissions.

You may not have permission to push directly to a main branch (master, development). If you are in an enterprise project, you should push your own topic branch to its remote and submit a merge request (MR).

Upvotes: 1

techloris_109

Reputation: 665

Since the branch I was trying to commit was my sub branch under master, I deleted it first from the repository (due to a back referencing issue). I then retried with push and it worked again!

Note: As part of deleting the initial branch, I had all the previous changes in the push I was about to do so no code were lost.

Upvotes: 0

SHADRACH CHIGOZIE MADUAKO

Reputation: 29

The push were rejected because the tip of your current branch is behind.

When I had such a situation, I just ran:

git push -f origin main

And it was done.

Upvotes: 1

M.Erkan Çam

Reputation: 193

If you tried all of the previous answers and the problem is still not solved, then make sure that the pushed branch name is unique and does not exist in remotes.

The error message might be misleading.

Upvotes: 1

Rahul Parab

Reputation: 27

You must have added new files in your commits which has not been pushed. Check the file, push that file again, and then try pull / push.

It will work. This worked for me...

Upvotes: 0

HoloLady

Reputation: 1043

I had this issue when trying to push after a rebase through Visual Studio Code. My issue was solved by just copying the command from the Git output window and executing it from the terminal window in Visual Studio Code.

In my case the command was something like:

git push origin NameOfMyBranch:NameOfMyBranch

Upvotes: 1

mfaani

Reputation: 36427

This just happened to me.

I made a pull request to our master yesterday.
My colleague was reviewing it today and saw that it was out of sync with our master branch, so with the intention of helping me, he merged master to my branch.
I didn't know he did that.
Then I merged master locally, tried to push it, but it failed. Why? Because my colleague merge with master created an extra commit I did not have locally!

Solution: Pull down my own branch so I get that extra commit. Then push it back to my remote branch.

On my branch I literally did:

git pull
git push

Upvotes: 8

Deepesh Nair

Reputation: 370

This is how I solved my problem:

Let's assume the upstream branch is the one that you forked from and origin is your repository and you want to send an MR/PR to the upstream branch.

You already have, let's say, about four commits and you are getting Updates were rejected because the tip of your current branch is behind.

Here is what I did

First, squash all your four commits:

git rebase -i HEAD~4

You'll get a list of commits with pick written on them (opened in an editor).

Example

pick fda59df commit 1
pick x536897 commit 2
pick c01a668 commit 3
pick c011a77 commit 4

pick fda59df commit 1
squash x536897 commit 2
squash c01a668 commit 3
squash c011a77 commit 4

After that, you can save your combined commit

You'll need to stash your commit.

Here's how:

git reset --soft HEAD~1
git stash

Now rebase with your upstream branch:

git fetch upstream beta && git rebase upstream/beta

Now pop your stashed commit:

git stash pop

Commit these changes and push them:

git add -A
git commit -m "[foo] - foobar commit"
git push origin fix/#123 -f

Upvotes: 6

kris

Reputation: 1219

It must be because of the commit is ahead of your current push.

git pull origin "name of branch you want to push"
git rebase

If git rebase is successful, then good. Otherwise, you have resolve all merge conflicts locally and keep it continuing until the rebase with remote is successful.
git rebase --continue

Upvotes: 12

Allan F

Reputation: 2298

The command I used with Azure DevOps when I encountered the message "updates were rejected because the tip of your current branch is behind" was/is this command:

git pull origin master

(or can start with a new folder and do a clone)...

This answer doesn't address the question posed, specifically, Keif has answered this, but it does answer the question's title/heading text and this will be a common question for Azure DevOps users.

I noted comment: "You'd always want to make sure that you do a pull before pushing" in the answer from Keif!

I have also used Git GUI tool in addition to the Git command line tool.

(I wasn't sure how to do the equivalent of the command line command "git pull origin master" within Git GUI, so I'm back to the command line to do this).

A diagram that shows the various Git commands for various actions that you might want to undertake is this one:

Upvotes: 14

Alex Reuka

Reputation: 91

Me help next:

git stash
git pull origin master
git apply
git commit -m "some comment"
git push

Upvotes: 4

Keif Kraken

Reputation: 10660

The -f is actually required because of the rebase. Whenever you do a rebase you would need to do a force push because the remote branch cannot be fast-forwarded to your commit. You'd always want to make sure that you do a pull before pushing, but if you don't like to force push to master or dev for that matter, you can create a new branch to push to and then merge or make a PR.

Upvotes: 978

mhatch

Reputation: 4605

To make sure your local branch FixForBug is not ahead of the remote branch FixForBug pull and merge the changes before pushing.

git pull origin FixForBug
git push origin FixForBug

Upvotes: 131

Greg Hewgill

Reputation: 994311

If you want to avoid having to use -f, then you can use just

git pull

instead of

git pull --rebase

The non-rebase will fetch the changes from origin/dev and merge them into your FixForBug branch. Then, you will be able to run

git push origin FixForBug

without using -f.

Upvotes: 48

Updates were rejected because the tip of your current branch is behind its remote counterpart

Answers (30)

Example

Next

Related Questions