How to resolve git error Updates were rejected because the tip of your current branch is behind

Question

A well meaning colleague has pushed changes to the Master instead of making a branch   This means that when I try to commit I get the error   Updates were rejected because the tip of your current branch is behind  I know this should be resolved by making a pull request to re-sync things but I don t want to lose the changes I have made locally and I equally don t want to force the commit and wipe out the changes made by someone else  What is the correct approach to allow me to merge the changes without losing either

User · Answer

This issue occurs when someone has commited the code to develop/master and latest code has not been rebased from develop/master and you're trying to overwrite new changes to develop/master branch

Solution:

Take a backup if you're working on feature branch and switch to master/develop branch by doing git checkout develop/master
Do git pull
You will get changes and merge conflicts occur when you have made changes in the same file which has not been rebased from develop/master
Resolve the conflicts if it occurs and do git push,this should work

User · Answer

I would do it this this way    Stage all unstaged changes   git add    Stash the changes   git stash save  Sync with remote   git pull -r  Reapply the local changes   git stash pop   or  git stash apply

User · Answer

This worked for me  git branch  Copy the current branch name to clipboard git pull origin  lt paste-branch-name gt  git push

User · Answer

I was able to overcome this issue with the following Visual Studio 2017 change    In Team Explorer  go to Settings  Go to Global Settings to configure this option at the global level  go to Repository Settings to configure this option at the repo level  Set Rebase local branch when pulling to the desired setting  for me it was True   and select Update to save    See  https   docs microsoft com en-us vsts git concepts git-config view vsts amp tabs visual-studio rebase-local-branch-when-pulling

User · Answer

I had the exact same issue on my branch lets call it branch B  and I followed three simple steps to get make it work   Switched to the master branch  git checkout master  Did a pull on the master  git pull  Created new branch  git branch C  - note here that we are now branching from master Now when you are on branch C  merge with branch B  git merge B  Now do a push  git push origin C  - works      Now you can delete branch B and then rename branch C to branch B    Hope this helps

User · Answer

I had this issue and I realized that  gitignore file is changed  So  I changed  gitignore and I could pull the changes

User · Answer

If you have already made some commits  you can do the following  git pull --rebase   This will place all your local commits on top of newly pulled changes   BE VERY CAREFUL WITH THIS  this will probably overwrite all your present files with the files as they are at the head of the branch in the remote repo  If this happens and you didn t want it to you can UNDO THIS CHANGE with   git rebase --abort        naturally you have to do that before doing any new commits

User · Answer

I had the same problem  Unfortunately I was in wrong catalog level   I tried to  git push -u origin master -  there was a error  Then I tried  git pull --rebase -  there still was a problem Finally i change directory cd your directory  Then I tried again   git push  and it works

User · Answer

You are not currently on a branch  To push the history leading to the current  detached HEAD  state now  use git push origin HEAD  lt name-of-remote-branch gt

[git] How to resolve git error: "Updates were rejected because the tip of your current branch is behind"

Examples related to git

Examples related to bitbucket

Examples related to git-merge