The problem is that you are not tracking the files locally but identical files are tracked remotely so in order to “pull” your system would be forced to overwrite the local files which are not version controlled.
Try running
git add * git stash git pull
This will track all files, remove all of your local changes to those files, and then get the files from the server.
Related Posts:
- The following untracked working tree files would be overwritten by merge, but I don’t care
- The following untracked working tree files would be overwritten by merge, but I don’t care
- Is it possible to pull just one file in Git?
- How to resolve git status “Unmerged paths:”?
- What is the best (and safest) way to merge a Git branch into master?
- How to merge branch to master?
- Undo a Git merge that hasn’t been pushed yet
- Git merge hotfix branch into feature branch
- Abort a Git Merge
- Git fetch remote branch
- Git fetch remote branch
- How to resolve merge conflicts in a Git repository
- How can I merge multiple commits onto another branch as a single squashed commit?
- How can I merge multiple commits onto another branch as a single squashed commit?
- Why does git say “Pull is not possible because you have unmerged files”?
- Why does git say “Pull is not possible because you have unmerged files”?
- merge one local branch into another local branch
- Git error on commit after merge – fatal: cannot do a partial commit during a merge
- Is there a “theirs” version of “git merge -s ours”?
- .gitignore and “The following untracked working tree files would be overwritten by checkout”
- What is the difference between `git merge` and `git merge –no-ff`?
- .gitignore and “The following untracked working tree files would be overwritten by checkout”
- Is there a “theirs” version of “git merge -s ours”?
- Why does git say “Pull is not possible because you have unmerged files”?
- Updates were rejected because the remote contains work that you do not have locally
- How to keep a branch synchronized/updated with master?
- Resolve Git merge conflicts in favor of their changes during a pull
- Found a swap file by the name
- Git removing upstream from local repository
- Is there a git-merge –dry-run option?
- Git pull – Please move or remove them before you can merge
- How do you merge two Git repositories?
- Git merge reports “Already up-to-date” though there is a difference
- How to merge a specific commit in Git
- git fetch doesn’t update my local repository
- Eclipse EGit Checkout conflict with files: – EGit doesn’t want to continue
- How do I rename a local Git branch?
- Git refusing to merge unrelated histories on rebase
- What is the difference between git push origin and git push origin master
- git – remote add origin vs remote set-url origin
- How do I undo ‘git add’ before commit?
- Git: Message ‘src refspec master does not match any’ when pushing commits in Git
- How can I see the differences between two branches?
- How to upgrade Git on Windows to the latest version
- Need to reset git branch to origin version
- How do I push a new local branch to a remote Git repository and track it too?
- git: fatal: Could not read from remote repository
- Windows git “warning: LF will be replaced by CRLF”, is that warning tail backward?
- How to change the URI (URL) for a remote Git repository?
- What would I use git-worktree for?
- Git error when trying to push — pre-receive hook declined
- How do I revert all local changes in Git managed project to previous state?
- How to revert multiple git commits?
- How to cherry-pick multiple commits
- fatal: The current branch master has no upstream branch
- Undo git pull, how to bring repos to old state
- Another git process seems to be running in this repository
- rejected master -> master (non-fast-forward)
- How to cherry-pick multiple commits
- Reset local repository branch to be just like remote repository HEAD
- What is “origin” in Git?
- Another git process seems to be running in this repository
- How do you stash an untracked file?
- How do I call git diff on the same file between 2 different local branches?
- How to git rebase a branch with the onto command?
- Remove a git commit which has not been pushed
- How can I make Git “forget” about a file that was tracked, but is now in .gitignore?
- How to remove files from git staging area?
- How to rename a directory/folder on GitHub website?
- How do I ignore an error on ‘git pull’ about my local changes would be overwritten by merge?
- Create a git patch from the uncommitted changes in the current working directory
- How to undo git reset –soft to get my changes back?
- git – Your branch is ahead of ‘origin/master’ by 1 commit
- Git: How to update/checkout a single file from remote origin master?
- Git merge with force overwrite
- ERROR: Error cloning remote repo ‘origin’
- How can I remove a commit on GitHub?
- What is the difference between ‘git remote update’, ‘git fetch’ and ‘git pull’?
- GitLab remote: HTTP Basic: Access denied and fatal Authentication
- How can I add a blank directory to a Git repository?
- Git Extensions: Win32 error 487: Couldn’t reserve space for cygwin’s heap, Win32 error 0
- What does git push origin HEAD mean?
- Delete branches in Bitbucket
- What to gitignore from the .idea folder?git intellij-idea gitignore webstorm
- How do you clone a Git repository into a specific folder?
- git checkout master error: the following untracked working tree files would be overwritten by checkout
- How can I see the changes in a Git commit?
- Completely cancel a rebase
- How to discard local changes and pull latest from GitHub repository
- Unlink of file Failed. Should I try again?
- Resetting remote to a certain commit
- Change the location of the ~ directory in a Windows install of Git Bash
- difference between git merge origin/master and git pull
- Git checkout – switching back to HEAD
- How to create a new branch from a tag?
- Import existing source code to GitHub
- git checkout all the files
- Workflow for working with git and WordPress
- best practice on pushing staging development (database/uploads) to the live server
- how can I create a WP offline environment before releasing the websites? [closed]