Git Pull is Not Possible, Unmerged Files

Say the remote is origin and the branch is master, and say you already have master checked out, might try the following:

git fetch origin
git reset --hard origin/master

This basically just takes the current branch and points it to the HEAD of the remote branch.

WARNING: As stated in the comments, this will throw away your local changes and overwrite with whatever is on the origin.

Or you can use the plumbing commands to do essentially the same:

git fetch <remote>
git update-ref refs/heads/<branch> $(git rev-parse <remote>/<branch>)
git reset --hard

EDIT: I’d like to briefly explain why this works.

The .git folder can hold the commits for any number of repositories. Since the commit hash is actually a verification method for the contents of the commit, and not just a randomly generated value, it is used to match commit sets between repositories.

A branch is just a named pointer to a given hash. Here’s an example set:

$ find .git/refs -type f
.git/refs/tags/v3.8
.git/refs/heads/master
.git/refs/remotes/origin/HEAD
.git/refs/remotes/origin/master

Each of these files contains a hash pointing to a commit:

$ cat .git/refs/remotes/origin/master
d895cb1af15c04c522a25c79cc429076987c089b

These are all for the internal git storage mechanism, and work independently of the working directory. By doing the following:

git reset --hard origin/master

git will point the current branch at the same hash value that origin/master points to. Then it forcefully changes the working directory to match the file structure/contents at that hash.

To see this at work go ahead and try out the following:

git checkout -b test-branch
# see current commit and diff by the following
git show HEAD
# now point to another location
git reset --hard <remote>/<branch>
# see the changes again
git show HEAD

Related Posts:

  1. How do I delete a Git branch locally and remotely?
  2. What is git tag, How to create tags & How to checkout git remote tag(s)
  3. Difference between “git add -A” and “git add .”
  4. Git: Message ‘src refspec master does not match any’ when pushing commits in Git
  5. What is the best (and safest) way to merge a Git branch into master?
  6. How can I switch to another branch in git?
  7. Squash my last X commits together using Git
  8. How to apply a patch generated with git format-patch?
  9. Abort a Git Merge
  10. GitHub: Permission denied (publickey). fatal: Could not read from remote repository
  11. How to delete a remote tag?
  12. Updates were rejected because the tip of your current branch is behind its remote counterpart
  13. Updates were rejected because the tip of your current branch is behind its remote counterpart
  14. git stash apply version
  15. Git fetch remote branch
  16. Updating a local repository with changes from a GitHub repository
  17. How do I remove a submodule?
  18. Git push results in “Authentication Failed”
  19. What does “Changes not staged for commit” mean
  20. git: fatal: Could not read from remote repository
  21. How do I update Homebrew?
  22. Git error when trying to push — pre-receive hook declined
  23. How can I merge multiple commits onto another branch as a single squashed commit?
  24. Gitignore not working
  25. Could not open a connection to your authentication agent
  26. How to get just one file from another branch?
  27. git checkout a single file from another branch and put in different folder
  28. Update Git branches from master
  29. Stash only one file out of multiple files that have changed with Git?
  30. How to find my GitHub username so that I can be found via the URL?
  31. Create a branch in Git from another branch
  32. Create Git branch with current changes
  33. github website publish cannot publish unborn HEAD
  34. What is HEAD in Git?
  35. What are the differences between git remote prune, git prune, git fetch –prune, etc
  36. How to get the current branch name in Git?
  37. How can I git stash a specific file?
  38. How do I resolve git saying “Commit your changes or stash them before you can merge”?
  39. How do you stash an untracked file?
  40. Filename too long in Git for Windows
  41. How to name and retrieve a stash by name in git?
  42. Stash just a single file
  43. Stash just a single file
  44. Git – Ignore node_modules folder everywhere
  45. How do I provide a username and password when running “git clone [email protected]”?
  46. How to undo ‘git reset’?
  47. “*** Please tell me who you are.” when using SSH key
  48. master branch and ‘origin/master’ have diverged, how to ‘undiverge’ branches’?
  49. fatal: Not a valid object name: ‘master’
  50. Git and nasty “error: cannot lock existing info/refs fatal”
  51. How do I delete a local repository in git?
  52. Throw away local commits in Git
  53. Hard reset of a single file
  54. How to remove remote origin from a Git repository
  55. .gitignore and “The following untracked working tree files would be overwritten by checkout”
  56. Is there a “theirs” version of “git merge -s ours”?
  57. How to clone a specific Git tag
  58. How do I copy a version of a single file from one Git branch to another?
  59. Git: cannot checkout branch – error: pathspec ‘…’ did not match any file(s) known to git
  60. Heroku: How to change a Git remote on Heroku
  61. Invalid VCS root mapping – 3 errors on my project
  62. Updates were rejected because the remote contains work that you do not have locally
  63. Undoing a ‘git push’
  64. What’s the significance of the “No newline at end of file” log?
  65. What is the difference between pull and clone in git?
  66. How do I clone a single branch in Git?
  67. Git update submodules recursively
  68. Do a “git export” (like “svn export”)?
  69. how to reset develop branch to master
  70. “fatal: HttpRequestException encountered.” Error with GitHub/Bitbucket Repositories due to dropping TLS-1.0 support
  71. Git’s local repository and remote repository — confusing concepts
  72. How do I set up Eclipse/EGit with GitHub?
  73. Repository size limits for GitHub.com
  74. How do i git push specific branch?
  75. fatal: could not read Username for ‘https://github.com’: No such file or directory
  76. git push origin master does not work
  77. How can I see which Git branches are tracking which remote / upstream branch?
  78. Git clone verbose output?
  79. Could not create work tree dir ‘example.com’.: Permission denied
  80. TortoiseGit-git did not exit cleanly (exit code 1)
  81. How to answer the git prompt in npm init for a local repo
  82. failed to push some refs to [email protected]
  83. How to update Git clone
  84. Git says “Automatic merge failed”, what does it mean?
  85. Sourcetree adding files in global .gitignore, not in repository .gitignore
  86. How to configure git bash command line completion?
  87. How to stop tracking and ignore changes to a file in Git?
  88. Does running git init twice initialize a repository or reinitialize an existing repo?
  89. Eclipse EGit Checkout conflict with files: – EGit doesn’t want to continue
  90. Git Push Error: insufficient permission for adding an object to repository database
  91. Git push requires username and password
  92. WordPress with Git
  93. WordPress Git Workflow Help
  94. WordPress and Git – What folders should I track?
  95. Pull latest stable release via git [closed]
  96. Why do the Roots theme CSS files not load (404)?
  97. Painless way to track remote Git repo for WordPress updates
  98. Questions about Git and WordPress [duplicate]
  99. WordPress on git – need help with configuration
  100. What’s is the best stack for cPanel continuous deployment?

Leave a Comment

tech