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?
git stash your changes (if they are uncommitted), sync with remote, reapply changes with git stash pop
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!
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
git pull -r will mean that any commits you have done relative to the head of the remote branch will be utterly destroyed! Your "stash" will only be changes relative to your last local commit! The OP says specifically in a comment "I had already made a couple of local commits before attempting to push" ...
git pull -r is a matter of personal preference as I have indicated. And I would use it on scenarios when doing so will not result to merge conflicts or commit destruction as @mike mentioned. Otherwise, git pull would suffice. The beauty of using git pull -r, in my opinion in the above situation when it does not result to merge conflict, is that it puts my local commits on top (i.e. cleaner log history) by not creating the extra automaticmergecommit which I find as 'noise' and avoidable.
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.
This worked for me:
git pull origin $(git branch --show-current)
git push
fyi git branch --show-current returns the name of the current branch.
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!
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
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.
I have used
git push origin master
After update refusing, I looked up at a history:
git log --oneline --all
My HEAD -> master was above origin/master.
But I used forcing, and it was sufficient:
git push --force-with-lease origin master
And the heads are together again...
You are not currently on a branch. To push the history leading to the current (detached HEAD) state now, use
git push origin HEAD:<name-of-remote-branch>
I had the same issue.
Fix: git pull origin {branch-name} sorted all.
Ref: There is no tracking information for the current branch
This worked for me and i will recommend it to you. if you are on the local branch that you have commited, try renaming the branch with this git command
git branch -m <new_name>
then push again with
git push --set-upstream origin <new_name>
I had this issue and I realized that .gitignore file is changed. So, I changed .gitignore and I could pull the changes.
Follow WeChat
Success story sharing
Want to stay one step ahead of the latest teleworks?
Subscribe Now相似问题
- How to remove local (untracked) files from the current Git working tree
- How to retrieve the hash for the current commit in Git?
- Undo a Git merge that hasn't been pushed yet
- Make the current Git branch a master branch
- How do I properly force a Git push?
- How can I reconcile detached HEAD with master/origin?
- How do I get the current branch name in Git?
- Git fetch remote branch
- How do I resolve git saying "Commit your changes or stash them before you can merge"?
- Updates were rejected because the tip of your current branch is behind its remote counterpart
git pull --rebase <remote> <branch>and then fix merge conflicts. Thengit addand finallygit rebase --continue. Something may be off with your local and remote branches that needs to be fixed.