Updates were rejected because the remote contains work that you do not have locally

git pull <remote> master:dev will fetch the remote/master branch and merge it into your local/dev branch.

git pull <remote> dev will fetch the remote/dev branch, and merge it into your current branch.

I think you said the conflicting commit is on remote/dev, so that is the branch you probably intended to fetch and merge.

In that case, you weren’t actually merging the conflict into your local branch, which is sort of weird since you said you saw the incorrect code in your working copy. You might want to check what is going on in remote/master.

Related Posts:

  1. How do I delete a Git branch locally and remotely?
  2. How do I delete a Git branch locally and remotely?
  3. How do I rename a local Git branch?
  4. How do I undo the most recent local commits in Git?
  5. How to merge branch to master?
  6. How can I switch to another branch in git?
  7. Download single files from GitHub
  8. How to revert multiple git commits?
  9. The following untracked working tree files would be overwritten by merge, but I don’t care
  10. How to revert multiple git commits?
  11. The following untracked working tree files would be overwritten by merge, but I don’t care
  12. merge one local branch into another local branch
  13. What does “Git push non-fast-forward updates were rejected” mean?
  14. Git error on commit after merge – fatal: cannot do a partial commit during a merge
  15. How can I reset or revert a file to a specific revision?
  16. What is the difference between `git merge` and `git merge –no-ff`?
  17. The following untracked working tree files would be overwritten by merge, but I don’t care
  18. git – Your branch is ahead of ‘origin/master’ by 1 commit
  19. Your configuration specifies to merge with the from the remote, but no such ref was fetched.?
  20. Set up git to pull and push all branches
  21. Invalid VCS root mapping – 3 errors on my project
  22. how to reset develop branch to master
  23. “fatal: HttpRequestException encountered.” Error with GitHub/Bitbucket Repositories due to dropping TLS-1.0 support
  24. SourceTree keeps asking for Github password
  25. Delete branches in Bitbucket
  26. How to resolve git status “Unmerged paths:”?
  27. How can I see the changes in a Git commit?
  28. How do you merge two Git repositories?
  29. Git merge reports “Already up-to-date” though there is a difference
  30. How to merge a specific commit in Git
  31. How can I delete all Git branches which have been merged?
  32. difference between git merge origin/master and git pull
  33. Eclipse EGit Checkout conflict with files: – EGit doesn’t want to continue
  34. How can I push a specific commit to a remote, and not previous commits?
  35. What’s a good (free) visual merge tool for Git? (on windows)
  36. Pull latest stable release via git [closed]
  37. Version control with a team of non-developers
  38. Painless way to track remote Git repo for WordPress updates
  39. Questions about Git and WordPress [duplicate]
  40. What does cherry-picking a commit with Git mean?
  41. Git refusing to merge unrelated histories on rebase
  42. What is the difference between git push origin and git push origin master
  43. git – remote add origin vs remote set-url origin
  44. Git: Message ‘src refspec master does not match any’ when pushing commits in Git
  45. How to upgrade Git on Windows to the latest version
  46. How do I push a new local branch to a remote Git repository and track it too?
  47. git: fatal: Could not read from remote repository
  48. Windows git “warning: LF will be replaced by CRLF”, is that warning tail backward?
  49. What does “Changes not staged for commit” mean
  50. How can I make git accept a self signed certificate?
  51. How to change the URI (URL) for a remote Git repository?
  52. What would I use git-worktree for?
  53. Git error when trying to push — pre-receive hook declined
  54. Git: How to squash all commits on branch
  55. How do I revert all local changes in Git managed project to previous state?
  56. You have not concluded your merge (MERGE_HEAD exists)
  57. git – pulling from specific branch
  58. How to copy commits from one branch to another?
  59. Another git process seems to be running in this repository
  60. How do you stash an untracked file?
  61. How do I call git diff on the same file between 2 different local branches?
  62. How to git rebase a branch with the onto command?
  63. Trying to git pull with error: cannot open .git/FETCH_HEAD: Permission denied
  64. Remove a git commit which has not been pushed
  65. Remove a git commit which has not been pushed
  66. There is no tracking information for the current branch
  67. Git push results in “Authentication Failed”
  68. What are the differences between .gitignore and .gitkeep?
  69. What’s the difference between git switch and git checkout
  70. What is the point of ‘git submodule init’?
  71. Git nothing added to commit but untracked files present – even with those files added to gitignore
  72. Git merge with force overwrite
  73. ERROR: Error cloning remote repo ‘origin’
  74. git push to specific branch
  75. What does git push origin HEAD mean?
  76. Do I commit the package-lock.json file created by npm 5?
  77. Why does Git say my master branch is “already up to date” even though it is not?
  78. What to gitignore from the .idea folder?git intellij-idea gitignore webstorm
  79. How do you clone a Git repository into a specific folder?
  80. Aborting commit due to empty commit message
  81. git checkout master error: the following untracked working tree files would be overwritten by checkout
  82. How to update a branch with master on GitHub
  83. Git removing upstream from local repository
  84. Git pull – Please move or remove them before you can merge
  85. Unlink of file Failed. Should I try again?
  86. How to recover stashed uncommitted changes
  87. Git Pull is Not Possible, Unmerged Files
  88. Resetting remote to a certain commit
  89. Change the location of the ~ directory in a Windows install of Git Bash
  90. git replace local version with remote version
  91. Where is git.exe located?
  92. How to find which git branch I am on when my disk is mounted on other server
  93. Git checkout – switching back to HEAD
  94. How to create a new branch from a tag?
  95. Workflow for working with git and WordPress
  96. best practice on pushing staging development (database/uploads) to the live server
  97. Initial wordpress deploy via git
  98. How to use wordpress with Git?
  99. Is it possible to checkout a beta version of WordPress via github?
  100. how can I create a WP offline environment before releasing the websites? [closed]

Leave a Comment