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 delete a Git branch locally and remotely?
- Difference between “git add -A” and “git add .”
- Git: Message ‘src refspec master does not match any’ when pushing commits in Git
- How can I switch to another branch in git?
- GitHub: Permission denied (publickey). fatal: Could not read from remote repository
- Updates were rejected because the tip of your current branch is behind its remote counterpart
- Git: How do I force “git pull” to overwrite local files?
- git stash apply version
- Updating a local repository with changes from a GitHub repository
- How do I remove a submodule?
- Git push results in “Authentication Failed”
- Git push results in “Authentication Failed”
- Download single files from GitHub
- Ignoring directories in Git repositories on Windows
- How to find my GitHub username so that I can be found via the URL?
- Create Git branch with current changes
- How do I merge a branch into a master in github?
- github website publish cannot publish unborn HEAD
- Why do I have to “git push –set-upstream origin
“? - How do you create a remote Git branch?
- Move the most recent commit(s) to a new branch with Git
- rejected master -> master (non-fast-forward)
- How to name and retrieve a stash by name in git?
- Create a tag in a GitHub repository
- How can I delete a file from a Git repository?
- Git: Could not resolve host github.com error while cloning remote repository in git
- Make an existing Git branch track a remote branch?
- What is the difference between ‘git pull’ and ‘git fetch’?
- How do you create a remote Git branch?
- How do I update or sync a forked repository on GitHub?
- Git reset single file in feature branch to be the same as in master
- What is difference between ‘git reset –hard HEAD~1’ and ‘git reset –soft HEAD~1’?
- How can I reset or revert a file to a specific revision?
- Pull request vs Merge request
- error: cannot lock ref.. ‘refs/tags’ exists; cannot create ‘refs/tags/
- git checkout tag, git pull fails in branch
- Your configuration specifies to merge with the
from the remote, but no such ref was fetched.? - ! [rejected] master -> master (fetch first)
- How to git add a whole folder
- Git how to clone with SSH key, username
- fatal: This operation must be run in a work tree
- How to replace local branch with remote branch entirely in Git?
- Git diff against a stash
- How to revert a “git rm -r .”?
- How do I push a local Git branch to master branch in the remote?
- How to clone git repository with specific revision/changeset?
- How to compare a local Git branch with its remote branch
- How to permanently remove few commits from remote branch
- Git – Remove commit from history
- Add all files to a commit except a single file?
- failed to push some refs to [email protected]
- How to update Git clone
- Sourcetree adding files in global .gitignore, not in repository .gitignore
- git pull remote branch cannot find remote ref
- How do I change the default location for Git Bash on Windows?
- Does running git init twice initialize a repository or reinitialize an existing repo?
- Git Push Error: insufficient permission for adding an object to repository database
- Git push requires username and password
- WordPress with Git
- WordPress Git Workflow Help
- Multiple copies of the same website: how to organize code/architecture?
- Version control with a team of non-developers
- Questions about Git and WordPress [duplicate]
- What’s is the best stack for cPanel continuous deployment?