git pull wants you to either remove or save your current work so that the merge it triggers doesn’t cause conflicts with your uncommitted work. Note that you should only need to remove/save untracked files if the changes you’re pulling create files in the same locations as your local uncommitted files.
Remove your uncommitted changes
Tracked files
git checkout -f
Untracked files
git clean -fd
Save your changes for later
Tracked files
git stash
Tracked files and untracked files
git stash -u
Reapply your latest stash after git pull:
git stash pop
Related Posts:
- 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
- error: src refspec master does not match any
- How can I switch to another branch in git?
- What is the `git restore` command and what is the difference between `git restore` and `git reset`?
- GitHub: Permission denied (publickey). fatal: Could not read from remote repository
- Git fetch remote branch
- Updates were rejected because the tip of your current branch is behind its remote counterpart
- git stash apply version
- Git fetch remote branch
- Practical uses of git reset –soft?
- 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
- Undoing a git rebase
- How to resolve merge conflicts in a Git repository
- Ignoring directories in Git repositories on Windows
- How can I merge multiple commits onto another branch as a single squashed commit?
- How do I resolve git saying “Commit your changes or stash them before you can merge”?
- How to find my GitHub username so that I can be found via the URL?
- Create Git branch with current changes
- github website publish cannot publish unborn HEAD
- The following untracked working tree files would be overwritten by merge, but I don’t care
- 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
- How do I resolve git saying “Commit your changes or stash them before you can merge”?
- rejected master -> master (non-fast-forward)
- How do you stash an untracked file?
- How to name and retrieve a stash by name in git?
- Create a tag in a GitHub repository
- Filename too long in Git for Windows
- What is the difference between git rm –cached and git reset
? - How can I delete a file from a Git repository?
- Git: Could not resolve host github.com error while cloning remote repository in git
- What does git rev-parse do?
- Make an existing Git branch track a remote branch?
- git – pulling from specific branch
- GitHub: invalid username or password
- Why do I have to “git push –set-upstream origin
“? - How do you create a remote Git branch?
- How do I update or sync a forked repository on GitHub?
- Stash just a single file
- How can I reset or revert a file to a specific revision?
- How do I provide a username and password when running “git clone [email protected]”?
- “*** Please tell me who you are.” when using SSH key
- master branch and ‘origin/master’ have diverged, how to ‘undiverge’ branches’?
- Pull request vs Merge request
- What is the difference between `git merge` and `git merge –no-ff`?
- git pull from master into the development branch
- Clone A Private Repository (Github)
- The following untracked working tree files would be overwritten by merge, but I don’t care
- Is there a “theirs” version of “git merge -s ours”?
- Your configuration specifies to merge with the
from the remote, but no such ref was fetched.? - How to clone a specific Git tag
- ! [rejected] master -> master (fetch first)
- How to git add a whole folder
- Heroku: How to change a Git remote on Heroku
- Updates were rejected because the remote contains work that you do not have locally
- fatal: This operation must be run in a work tree
- Undoing a ‘git push’
- How to replace local branch with remote branch entirely in Git?
- Git diff against a stash
- What’s the significance of the “No newline at end of file” log?
- How to revert a “git rm -r .”?
- Git update submodules recursively
- Do a “git export” (like “svn export”)?
- What does git push origin HEAD mean?
- How do I set up Eclipse/EGit with GitHub?
- Repository size limits for GitHub.com
- How to clone git repository with specific revision/changeset?
- How to compare a local Git branch with its remote branch
- git push origin master does not work
- How to permanently remove few commits from remote branch
- Found a swap file by the name
- Git clone verbose output?
- Could not create work tree dir ‘example.com’.: Permission denied
- Is there a git-merge –dry-run option?
- How to answer the git prompt in npm init for a local repo
- Add all files to a commit except a single file?
- How to update Git clone
- Git says “Automatic merge failed”, what does it mean?
- Sourcetree adding files in global .gitignore, not in repository .gitignore
- git pull remote branch cannot find remote ref
- How to configure git bash command line completion?
- How do I change the default location for Git Bash on Windows?
- How to stop tracking and ignore changes to a file in Git?
- 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?
- 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]