Git pull – Please move or remove them before you can merge

Apparently the files were added in remote repository, no matter what was the content of .gitignore file in the origin.

As the files exist in the remote repository, git has to pull them to your local work tree as well and therefore complains that the files already exist.

.gitignore is used only for scanning for the newly added files, it doesn’t have anything to do with the files which were already added.

So the solution is to remove the files in your work tree and pull the latest version. Or the long-term solution is to remove the files from the repository if they were added by mistake.

A simple example to remove files from the remote branch is to

$git checkout <brachWithFiles>
$git rm -r *.extension
$git commit -m "fixin...."
$git push

Then you can try the $git merge again

Related Posts:

  1. Is it possible to pull just one file in Git?
  2. What is the best (and safest) way to merge a Git branch into master?
  3. How do I force git pull to overwrite everything on every pull?
  4. Undo a Git merge that hasn’t been pushed yet
  5. Git merge hotfix branch into feature branch
  6. Abort a Git Merge
  7. How to resolve merge conflicts in a Git repository
  8. How can I merge multiple commits onto another branch as a single squashed commit?
  9. How can I merge multiple commits onto another branch as a single squashed commit?
  10. How do I ignore an error on ‘git pull’ about my local changes would be overwritten by merge?
  11. Why does git say “Pull is not possible because you have unmerged files”?
  12. How do I ignore an error on ‘git pull’ about my local changes would be overwritten by merge?
  13. The following untracked working tree files would be overwritten by merge, but I don’t care
  14. Why does git say “Pull is not possible because you have unmerged files”?
  15. The following untracked working tree files would be overwritten by merge, but I don’t care
  16. Git error on commit after merge – fatal: cannot do a partial commit during a merge
  17. There is no tracking information for the current branch
  18. Is there a “theirs” version of “git merge -s ours”?
  19. How do I ignore an error on ‘git pull’ about my local changes would be overwritten by merge?
  20. .gitignore and “The following untracked working tree files would be overwritten by checkout”
  21. Files not updating using ‘git pull’
  22. The following untracked working tree files would be overwritten by merge, but I don’t care
  23. .gitignore and “The following untracked working tree files would be overwritten by checkout”
  24. git checkout tag, git pull fails in branch
  25. Is there a “theirs” version of “git merge -s ours”?
  26. Why does git say “Pull is not possible because you have unmerged files”?
  27. How to resolve git status “Unmerged paths:”?
  28. fatal: could not read Username for ‘https://github.com’: No such file or directory
  29. How to keep a branch synchronized/updated with master?
  30. Resolve Git merge conflicts in favor of their changes during a pull
  31. Found a swap file by the name
  32. Is there a git-merge –dry-run option?
  33. How to `git pull` while ignoring local changes?
  34. Git push requires username and password
  35. How do I delete a Git branch locally and remotely?
  36. What is git tag, How to create tags & How to checkout git remote tag(s)
  37. Difference between “git add -A” and “git add .”
  38. Git: Message ‘src refspec master does not match any’ when pushing commits in Git
  39. Squash my last X commits together using Git
  40. How to apply a patch generated with git format-patch?
  41. How to delete a remote tag?
  42. Updates were rejected because the tip of your current branch is behind its remote counterpart
  43. What does “Changes not staged for commit” mean
  44. git: fatal: Could not read from remote repository
  45. How do I update Homebrew?
  46. Git error when trying to push — pre-receive hook declined
  47. Gitignore not working
  48. Could not open a connection to your authentication agent
  49. How to get just one file from another branch?
  50. git checkout a single file from another branch and put in different folder
  51. Update Git branches from master
  52. Stash only one file out of multiple files that have changed with Git?
  53. How to find my GitHub username so that I can be found via the URL?
  54. Create a branch in Git from another branch
  55. What is HEAD in Git?
  56. Why git asks to enter a commit message to explain why this merge is necessary
  57. What are the differences between git remote prune, git prune, git fetch –prune, etc
  58. How to get the current branch name in Git?
  59. How can I git stash a specific file?
  60. How to name and retrieve a stash by name in git?
  61. Stash just a single file
  62. Stash just a single file
  63. Git – Ignore node_modules folder everywhere
  64. Git: cannot do a partial commit during a merge (SourceTree)
  65. How to undo ‘git reset’?
  66. fatal: Not a valid object name: ‘master’
  67. Git and nasty “error: cannot lock existing info/refs fatal”
  68. How do I delete a local repository in git?
  69. Throw away local commits in Git
  70. Hard reset of a single file
  71. How to remove remote origin from a Git repository
  72. How do I copy a version of a single file from one Git branch to another?
  73. Git: cannot checkout branch – error: pathspec ‘…’ did not match any file(s) known to git
  74. Heroku: How to change a Git remote on Heroku
  75. Invalid VCS root mapping – 3 errors on my project
  76. What is the difference between pull and clone in git?
  77. How do I clone a single branch in Git?
  78. how to reset develop branch to master
  79. “fatal: HttpRequestException encountered.” Error with GitHub/Bitbucket Repositories due to dropping TLS-1.0 support
  80. Git’s local repository and remote repository — confusing concepts
  81. How do I set up Eclipse/EGit with GitHub?
  82. Repository size limits for GitHub.com
  83. How do i git push specific branch?
  84. git push origin master does not work
  85. How can I see which Git branches are tracking which remote / upstream branch?
  86. How to answer the git prompt in npm init for a local repo
  87. failed to push some refs to [email protected]
  88. Git says “Automatic merge failed”, what does it mean?
  89. How to configure git bash command line completion?
  90. How to stop tracking and ignore changes to a file in Git?
  91. Does running git init twice initialize a repository or reinitialize an existing repo?
  92. Eclipse EGit Checkout conflict with files: – EGit doesn’t want to continue
  93. WordPress with Git
  94. WordPress Git Workflow Help
  95. WordPress and Git – What folders should I track?
  96. Pull latest stable release via git [closed]
  97. Why do the Roots theme CSS files not load (404)?
  98. Painless way to track remote Git repo for WordPress updates
  99. WordPress on git – need help with configuration
  100. How to retrieve the last modification date of all files in a Git repository

Leave a Comment

tech