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 check out a remote Git branch?
- What does ‘–set-upstream’ do?
- What does ‘–set-upstream’ do?
- Squash my last X commits together using Git
- Git submodule update
- How to apply a patch generated with git format-patch?
- What does ‘git merge –abort is equivalent to git reset –merge when MERGE_HEAD is present.’ of Git merge man page mean?
- How to delete a remote tag?
- Updates were rejected because the tip of your current branch is behind its remote counterpart
- How do I clone a specific Git branch? [duplicate]
- Git : fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists
- Remove files from Git commit
- How to solve SSL certificate: self signed certificate when cloning repo from github?
- How do I revert a Git repository to a previous commit?
- How to revert multiple git commits?
- How do I fix a Git detached head?
- What is HEAD in Git?
- What are the differences between git remote prune, git prune, git fetch –prune, etc
- How can I git stash a specific file?
- Move the most recent commit(s) to a new branch with Git
- What does “Git push non-fast-forward updates were rejected” mean?
- How do I diff the same file between two different commits on the same branch?
- You have not concluded your merge (MERGE_HEAD exists)
- How to get the current branch name in Git?
- Git: How do I force “git pull” to overwrite local files?
- Meaning of the GitHub message: push declined due to email privacy restrictions
- Is there a command to undo git init?
- Download a single folder or directory from a GitHub repo
- Is there a “git touch” so I can push the same file with a new timestamp?
- Branch from a previous commit using Git
- Hard reset of a single file
- How to remove remote origin from a Git repository
- How do I copy a version of a single file from one Git branch to another?
- Git: cannot checkout branch – error: pathspec ‘…’ did not match any file(s) known to git
- Heroku: How to change a Git remote on Heroku
- Invalid VCS root mapping – 3 errors on my project
- Undoing a ‘git push’
- What’s the significance of the “No newline at end of file” log?
- What is the difference between pull and clone in git?
- How do I clone a single branch in Git?
- how to reset develop branch to master
- “fatal: HttpRequestException encountered.” Error with GitHub/Bitbucket Repositories due to dropping TLS-1.0 support
- Git’s local repository and remote repository — confusing concepts
- How do i git push specific branch?
- fatal: could not read Username for ‘https://github.com’: No such file or directory
- How can I see which Git branches are tracking which remote / upstream branch?
- Git clone verbose output?
- TortoiseGit-git did not exit cleanly (exit code 1)
- How to `git pull` while ignoring local changes?
- Uninitialize git repository
- How to create a local branch from an existing remote branch?
- Git says “Automatic merge failed”, what does it mean?
- How do I clone a subdirectory only of a Git repository?
- What is the .git folder?
- Updating and committing only a file’s permissions using git version control
- Create empty branch on GitHub
- Git – fatal: Unable to create ‘/path/my_project/.git/index.lock’: File exists
- What is the usual process of saving changes made at the CMS level into source control?
- Collaboratively develop a WordPress site
- WordPress Core files not being ignored by Git
- Painless way to track remote Git repo for WordPress updates
- Full site editor, hard-coded IDs in query blocks, and staging/dev servers
- How to tell which local branch is tracking which remote branch in Git?
- How do I edit git’s history to correct an incorrect email address/name [closed]